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)
     and '602a724dc26ce969fa9b4b7715ab5eefaa5043c5'


Trivial merge