Merge in trunk.
authorBrian Aker <brian@tangent.org>
Fri, 3 Jun 2011 02:18:21 +0000 (19:18 -0700)
committerBrian Aker <brian@tangent.org>
Fri, 3 Jun 2011 02:18:21 +0000 (19:18 -0700)

Trivial merge