merge of '12a5f73e8b6922f363bf3e18f46fb736deb6f823'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 18 Feb 2008 14:54:46 +0000 (14:54 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 18 Feb 2008 14:54:46 +0000 (14:54 +0000)
     and '7a170f4e49a2a3b05d6855d45d33f79e55f590a0'


Trivial merge