merge of '29c3523123b5b4cd06600394ae12aa149df07c8a'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Feb 2008 12:38:55 +0000 (12:38 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Feb 2008 12:38:55 +0000 (12:38 +0000)
     and 'c9d03a40dbab3e176a210a0dd6f1204d9ae94f49'


Trivial merge