merge of '12fa8ef0c447968799315a8b55e6d534dbf250ab'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Wed, 2 May 2007 22:28:37 +0000 (22:28 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Wed, 2 May 2007 22:28:37 +0000 (22:28 +0000)
commit1d7e64956bf90b38b702b4d480c65629f9013204
treec10217a6cec0737ac079385a5c640d555c57fa37
parentbfeeffe110ea61b84f895a0f26704debb0d9417f
parent39e146187adddf62ee64d2a9821325a5202922af
Merge ... '12fa8ef0c447968799315a8b55e6d534dbf250ab'
     and '8aeb8aa9214bbbda98b383508c226562616d35af'