merge of '48ac4b4de7e34d9fabc14d0f69415e4c1168e98b'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Fri, 1 Dec 2006 00:23:25 +0000 (00:23 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Fri, 1 Dec 2006 00:23:25 +0000 (00:23 +0000)
commit72381990d96809a96efa621e35064739bf768c67
treee77d34d3b9c5cb926c97c061db4eb15416716f35
parentf40b57f74954ef21a7a8b13286ae7398ce3fa99a
parentac547ab6e138482b52c677f71b91c57040cb1344
Merge ... '48ac4b4de7e34d9fabc14d0f69415e4c1168e98b'
     and '602a724dc26ce969fa9b4b7715ab5eefaa5043c5'