Merge Trond.
authorBrian Aker <brian@gaz>
Thu, 28 Jan 2010 19:06:36 +0000 (11:06 -0800)
committerBrian Aker <brian@gaz>
Thu, 28 Jan 2010 19:06:36 +0000 (11:06 -0800)

Trivial merge