Merge fixes from build.
authorBrian Aker <brian@tangent.org>
Fri, 25 Mar 2011 00:48:22 +0000 (17:48 -0700)
committerBrian Aker <brian@tangent.org>
Fri, 25 Mar 2011 00:48:22 +0000 (17:48 -0700)

Trivial merge