Merge of build trunk
authorBrian Aker <brian@tangent.org>
Mon, 20 Feb 2012 19:55:52 +0000 (11:55 -0800)
committerBrian Aker <brian@tangent.org>
Mon, 20 Feb 2012 19:55:52 +0000 (11:55 -0800)

Trivial merge