merge of '14adef1cb8437a9298373d856f25c230125dcdf6'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 21 Feb 2008 11:32:58 +0000 (11:32 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 21 Feb 2008 11:32:58 +0000 (11:32 +0000)
     and '5fb8cfe19138b98226fe92044d302c9379dad84d'


Trivial merge