Merge build trunk.
authorBrian Aker <brian@tangent.org>
Sat, 11 Feb 2012 22:36:26 +0000 (14:36 -0800)
committerBrian Aker <brian@tangent.org>
Sat, 11 Feb 2012 22:36:26 +0000 (14:36 -0800)

Trivial merge