merge of 'dbc92be1fe4742c442c336c46478ebc072b977ed'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Jan 2008 17:25:45 +0000 (17:25 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Jan 2008 17:25:45 +0000 (17:25 +0000)
     and 'f37c4d25879e2b68bedfa992671306a142e8181d'


Trivial merge