Merge for bug fix from Trond
authorBrian Aker <brian@gaz>
Thu, 16 Jul 2009 16:40:59 +0000 (09:40 -0700)
committerBrian Aker <brian@gaz>
Thu, 16 Jul 2009 16:40:59 +0000 (09:40 -0700)

Trivial merge