Merge Trond.
authorBrian Aker <brian@gaz>
Tue, 15 Sep 2009 19:20:33 +0000 (12:20 -0700)
committerBrian Aker <brian@gaz>
Tue, 15 Sep 2009 19:20:33 +0000 (12:20 -0700)

Trivial merge