Update from build trunk.
authorBrian Aker <brian@tangent.org>
Fri, 17 Feb 2012 20:50:29 +0000 (12:50 -0800)
committerBrian Aker <brian@tangent.org>
Fri, 17 Feb 2012 20:50:29 +0000 (12:50 -0800)

Trivial merge