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)
commit38497be873296b8ff53f0ea46898b1fd6ba0b0f9
treee2cbf3aa0ac1081f00b7b51a92e7070aab723ce8
parentefb4cd88349694b58003d7aca1da5394f4bfe38a
parent872ba8437eff950789563e5924c106add1f35116
Merge ... '2a36f6aaa2eeb730787d5a6b1803b12efde31e44'
     and 'ac475b9b4ff42b4a425ffca33a813dd7f3d095b6'