Merge from private trunk.
authorBrian Aker <brian@tangent.org>
Tue, 5 Apr 2011 04:53:05 +0000 (21:53 -0700)
committerBrian Aker <brian@tangent.org>
Tue, 5 Apr 2011 04:53:05 +0000 (21:53 -0700)

Trivial merge