Merge in trunk
authorBrian Aker <brian@tangent.org>
Tue, 19 Jul 2011 22:08:44 +0000 (15:08 -0700)
committerBrian Aker <brian@tangent.org>
Tue, 19 Jul 2011 22:08:44 +0000 (15:08 -0700)

Trivial merge