Merge in trunk.
authorBrian Aker <brian@tangent.org>
Sat, 17 Sep 2011 19:45:35 +0000 (12:45 -0700)
committerBrian Aker <brian@tangent.org>
Sat, 17 Sep 2011 19:45:35 +0000 (12:45 -0700)

Trivial merge