merge of '24bae19acc08cfef78544f0893bc16d124a3f204'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 7 Mar 2008 17:51:54 +0000 (17:51 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 7 Mar 2008 17:51:54 +0000 (17:51 +0000)
     and 'a3b18a00a09e716f4b3d5bfced86fea0439953a0'


Trivial merge