merge of 'a9b0b2d052fa806e034121432dba032618a0ec99'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Sat, 12 May 2007 15:43:35 +0000 (15:43 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Sat, 12 May 2007 15:43:35 +0000 (15:43 +0000)
     and 'e64a1bc4dc5a7ca1cc40979ed865f63b35041688'


Trivial merge