Merge of Trond's work.
authorBrian Aker <brian@Intel-Mini-2.local>
Thu, 8 Oct 2009 17:30:07 +0000 (10:30 -0700)
committerBrian Aker <brian@Intel-Mini-2.local>
Thu, 8 Oct 2009 17:30:07 +0000 (10:30 -0700)

Trivial merge