Update from build trunk.
authorBrian Aker <brian@tangent.org>
Mon, 11 Feb 2013 11:02:27 +0000 (03:02 -0800)
committerBrian Aker <brian@tangent.org>
Mon, 11 Feb 2013 11:02:27 +0000 (03:02 -0800)

Trivial merge