Merge trunk
authorBrian Aker <brian@tangent.org>
Fri, 7 Oct 2011 13:13:28 +0000 (06:13 -0700)
committerBrian Aker <brian@tangent.org>
Fri, 7 Oct 2011 13:13:28 +0000 (06:13 -0700)

Trivial merge