Rollup from build trunk.
authorBrian Aker <brian@tangent.org>
Thu, 26 Jan 2012 20:01:56 +0000 (12:01 -0800)
committerBrian Aker <brian@tangent.org>
Thu, 26 Jan 2012 20:01:56 +0000 (12:01 -0800)

Trivial merge