Merge in build trunk.
authorBrian Aker <brian@tangent.org>
Fri, 17 Feb 2012 02:41:48 +0000 (18:41 -0800)
committerBrian Aker <brian@tangent.org>
Fri, 17 Feb 2012 02:41:48 +0000 (18:41 -0800)

Trivial merge