Merge bug fix
authorBrian Aker <brian@gaz>
Thu, 8 Oct 2009 22:30:34 +0000 (15:30 -0700)
committerBrian Aker <brian@gaz>
Thu, 8 Oct 2009 22:30:34 +0000 (15:30 -0700)

Trivial merge