Merge fix.
authorBrian Aker <brian@gaz>
Thu, 15 Apr 2010 16:16:53 +0000 (09:16 -0700)
committerBrian Aker <brian@gaz>
Thu, 15 Apr 2010 16:16:53 +0000 (09:16 -0700)

Trivial merge