merge of '3e5c07282be03225713ccfe986e33b85e156fe00'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 26 Aug 2006 17:44:42 +0000 (17:44 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 26 Aug 2006 17:44:42 +0000 (17:44 +0000)
     and '6a4cba9a5f2d744231cc63907df52f0615c8d744'


Trivial merge