Merge of build trunk.
authorBrian Aker <brian@tangent.org>
Sun, 29 Jan 2012 02:09:10 +0000 (18:09 -0800)
committerBrian Aker <brian@tangent.org>
Sun, 29 Jan 2012 02:09:10 +0000 (18:09 -0800)

Trivial merge