merge of '8cfccf7d76cedeebb5fc468a8aa4943a21baf0bc'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 29 Feb 2008 16:13:36 +0000 (16:13 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 29 Feb 2008 16:13:36 +0000 (16:13 +0000)
     and 'cc62ac9db8f51dbeefed076296fcde38fb94e71b'


Trivial merge