merge of '694c143930f178ea5ccba7d4b239f54693907dfd'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Feb 2008 00:56:06 +0000 (00:56 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Feb 2008 00:56:06 +0000 (00:56 +0000)
     and '9a5c15be9874f0b2b7306eef34bbc113197516e3'


Trivial merge