Merge from trunk.
authorBrian Aker <brian@tangent.org>
Fri, 8 Jul 2011 01:04:46 +0000 (18:04 -0700)
committerBrian Aker <brian@tangent.org>
Fri, 8 Jul 2011 01:04:46 +0000 (18:04 -0700)

Trivial merge