Merge from build tree.
authorBrian Aker <brian@tangent.org>
Mon, 13 Aug 2012 15:58:16 +0000 (11:58 -0400)
committerBrian Aker <brian@tangent.org>
Mon, 13 Aug 2012 15:58:16 +0000 (11:58 -0400)

Trivial merge