merge of '43c960d45911aef12f2312ce6684bc1c3678b4c1'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 6 Mar 2008 00:35:26 +0000 (00:35 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 6 Mar 2008 00:35:26 +0000 (00:35 +0000)
     and 'fd24a981d47c073f1728f3aba7eaabcf9a2ac424'


Trivial merge