Merge from build trunk.
authorBrian Aker <brian@tangent.org>
Wed, 4 Jan 2012 05:59:51 +0000 (21:59 -0800)
committerBrian Aker <brian@tangent.org>
Wed, 4 Jan 2012 05:59:51 +0000 (21:59 -0800)

Trivial merge