Merge in fixes for 32bit
authorBrian Aker <brian@tangent.org>
Sat, 10 Sep 2011 21:08:58 +0000 (14:08 -0700)
committerBrian Aker <brian@tangent.org>
Sat, 10 Sep 2011 21:08:58 +0000 (14:08 -0700)

Trivial merge