Merge trunk
authorBrian Aker <brian@tangent.org>
Wed, 21 Sep 2011 17:21:09 +0000 (10:21 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 21 Sep 2011 17:21:09 +0000 (10:21 -0700)

Trivial merge