Merge trunk
authorBrian Aker <brian@tangent.org>
Mon, 15 Aug 2011 22:28:57 +0000 (15:28 -0700)
committerBrian Aker <brian@tangent.org>
Mon, 15 Aug 2011 22:28:57 +0000 (15:28 -0700)

Trivial merge