Merge in build trunk.
authorBrian Aker <brian@tangent.org>
Sun, 13 Jan 2013 11:46:07 +0000 (06:46 -0500)
committerBrian Aker <brian@tangent.org>
Sun, 13 Jan 2013 11:46:07 +0000 (06:46 -0500)

Trivial merge