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)
     and '8aeb8aa9214bbbda98b383508c226562616d35af'


Trivial merge