merge of '976e971fd6884363d9d2b100c0b842a538ba851b'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Mon, 8 Oct 2007 11:50:29 +0000 (11:50 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Mon, 8 Oct 2007 11:50:29 +0000 (11:50 +0000)
     and 'b0c4563563205076478d883b26a26f7ad87afd8a'


Trivial merge