merge of '36827e88b7d0394a63c9f1f96bd021aa80fd443c'
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 29 Nov 2006 12:19:17 +0000 (12:19 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 29 Nov 2006 12:19:17 +0000 (12:19 +0000)
     and 'f48c65e31adb332378372f7b45393669354ca0f4'


Trivial merge