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)

Trivial merge