Updates from Trond.
authorBrian Aker <brian@gaz>
Thu, 3 Dec 2009 17:10:24 +0000 (09:10 -0800)
committerBrian Aker <brian@gaz>
Thu, 3 Dec 2009 17:10:24 +0000 (09:10 -0800)

Trivial merge