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)
commit07def9544cbd75062d2641c5513e1d158b841f90
tree14385041ae7a15ba2926c163c18b7b8b297a9975
parent9bcd450682e20f0d704d86948bbb0880e414dfb4
parent54b628acfd0aa4915d97de81e68355b07c980a7d
Merge fixes from build.