merge of '1ba9df24f1f8128a61ec636e73db71360782f1fc'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Mon, 8 Oct 2007 00:39:28 +0000 (00:39 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Mon, 8 Oct 2007 00:39:28 +0000 (00:39 +0000)
     and 'dea5e3519d3dec40df1589da1320006917b7d768'


Trivial merge