Merge from trunk
authorBrian Aker <brian@tangent.org>
Thu, 22 Sep 2011 18:49:07 +0000 (11:49 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 22 Sep 2011 18:49:07 +0000 (11:49 -0700)

Trivial merge