Merge trunk.
authorBrian Aker <brian@tangent.org>
Thu, 21 Jul 2011 05:26:52 +0000 (22:26 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 21 Jul 2011 05:26:52 +0000 (22:26 -0700)

Trivial merge