Merge up of dev trees.
authorBrian Aker <brian@tangent.org>
Fri, 23 Sep 2011 00:36:48 +0000 (17:36 -0700)
committerBrian Aker <brian@tangent.org>
Fri, 23 Sep 2011 00:36:48 +0000 (17:36 -0700)

Trivial merge