Merge build trunk
authorBrian Aker <brian@tangent.org>
Tue, 14 Feb 2012 23:32:56 +0000 (15:32 -0800)
committerBrian Aker <brian@tangent.org>
Tue, 14 Feb 2012 23:32:56 +0000 (15:32 -0800)

Trivial merge