merge of '3387d5275b731c38ee945a83c391a2cc78cbc1a8'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Wed, 18 Apr 2007 17:14:58 +0000 (17:14 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Wed, 18 Apr 2007 17:14:58 +0000 (17:14 +0000)
     and '699c2c7a608569e8c0f66321183fdc3846699014'


Trivial merge