Merge in bug fix
authorBrian Aker <brian@tangent.org>
Wed, 21 Sep 2011 22:38:57 +0000 (15:38 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 21 Sep 2011 22:38:57 +0000 (15:38 -0700)

Trivial merge