merge of '84534f67cba0a9730d36b935b879e535f187b38d'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 15 Mar 2008 19:15:45 +0000 (19:15 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 15 Mar 2008 19:15:45 +0000 (19:15 +0000)
     and 'ceb8dd6449d4803228f8cbdf49c91c7c26fb5760'


Trivial merge