Merge of build trunk
authorBrian Aker <brian@tangent.org>
Wed, 11 Jan 2012 07:32:50 +0000 (23:32 -0800)
committerBrian Aker <brian@tangent.org>
Wed, 11 Jan 2012 07:32:50 +0000 (23:32 -0800)

Trivial merge