merge of '38b07284e4ef593d57320c1d1b3224ef07f91137'
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 15 Nov 2006 10:51:03 +0000 (10:51 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 15 Nov 2006 10:51:03 +0000 (10:51 +0000)
     and '3c5d934a8f839cba0ad4f74fbaac96826767a899'


Trivial merge