Merge staging tree to 1.0 trunk.
authorBrian Aker <brian@tangent.org>
Sun, 16 Sep 2012 23:31:57 +0000 (16:31 -0700)
committerBrian Aker <brian@tangent.org>
Sun, 16 Sep 2012 23:31:57 +0000 (16:31 -0700)
commit8a971e97129f99102be7452b91865325d58b4a70
tree7996638c3bb89b888a53a185fe00221d54582398
parent489157544c4bace78d18665f4304a88aaeef7069
parentaf788b4b866ef0220dcdc4c357efbcbdb942cd27
Merge staging tree to 1.0 trunk.