merge of 'd05c5906a41430c5dafdf6adb260f8aceefeeec1'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 12 Apr 2007 10:41:25 +0000 (10:41 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 12 Apr 2007 10:41:25 +0000 (10:41 +0000)
     and 'fdec91dbfe8a80988486ab34e99357cab36f7154'


Trivial merge