Merge from trunk.
authorBrian Aker <brian@tangent.org>
Thu, 7 Jul 2011 22:11:31 +0000 (15:11 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 7 Jul 2011 22:11:31 +0000 (15:11 -0700)

Trivial merge