merge of '787c9500fd515ecad11ceaa1f7b49e5e1c70006f'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 7 Mar 2008 17:52:43 +0000 (17:52 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 7 Mar 2008 17:52:43 +0000 (17:52 +0000)
     and '93c08db0250845bf12c335e4a53413860bbe6dfb'


Trivial merge