merge of '2375d2fb670fe2ce998bde5533f4ef0498268ca5'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 28 Dec 2007 17:51:14 +0000 (17:51 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 28 Dec 2007 17:51:14 +0000 (17:51 +0000)
     and 'dabc3297e759e315e1277ff276c735684af8e55d'


Trivial merge