merge of 'cd87faafb1baaea21105f7e6c92532f906050469'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Wed, 4 Apr 2007 18:48:50 +0000 (18:48 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Wed, 4 Apr 2007 18:48:50 +0000 (18:48 +0000)
     and 'ea691c5d58c6ea052d5fb36c169cfbedfea096b3'


Trivial merge