Merge in trunk.
authorBrian Aker <brian@tangent.org>
Thu, 2 Jun 2011 18:55:14 +0000 (11:55 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 2 Jun 2011 18:55:14 +0000 (11:55 -0700)

Trivial merge