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

Trivial merge