Merge from tip
authorBrian Aker <brian@tangent.org>
Wed, 26 Oct 2011 15:47:56 +0000 (08:47 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 26 Oct 2011 15:47:56 +0000 (08:47 -0700)

Trivial merge