Merge Trond.
authorBrian Aker <brian@gaz>
Tue, 6 Oct 2009 15:26:28 +0000 (08:26 -0700)
committerBrian Aker <brian@gaz>
Tue, 6 Oct 2009 15:26:28 +0000 (08:26 -0700)

Trivial merge