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)
commite2167a483dd9d48ed814422e04ca6f461dbceede
tree87a8ac6efa798c83aaa77715b7349128591ff7e1
parentb13a271ac57e40a271227d26601cd770f1a9e0ec
parentc5afefe753fdc2f383f83db5e8b02337a9034480
Merge ... 'd05c5906a41430c5dafdf6adb260f8aceefeeec1'
     and 'fdec91dbfe8a80988486ab34e99357cab36f7154'