Merge build trunk.
authorBrian Aker <brian@tangent.org>
Thu, 26 Jan 2012 07:13:53 +0000 (23:13 -0800)
committerBrian Aker <brian@tangent.org>
Thu, 26 Jan 2012 07:13:53 +0000 (23:13 -0800)

Trivial merge