Merge in fixes
authorBrian Aker <brian@tangent.org>
Sat, 9 Apr 2011 01:54:32 +0000 (18:54 -0700)
committerBrian Aker <brian@tangent.org>
Sat, 9 Apr 2011 01:54:32 +0000 (18:54 -0700)

Trivial merge