merge of '2a36f6aaa2eeb730787d5a6b1803b12efde31e44'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 26 Sep 2006 08:32:01 +0000 (08:32 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 26 Sep 2006 08:32:01 +0000 (08:32 +0000)
     and 'ac475b9b4ff42b4a425ffca33a813dd7f3d095b6'


Trivial merge