Merge trunk.
authorBrian Aker <brian@tangent.org>
Wed, 14 Sep 2011 23:06:31 +0000 (16:06 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 14 Sep 2011 23:06:31 +0000 (16:06 -0700)

Trivial merge