merge of '2252cd76f2f46ab37804dcbaee991492ea4dc682'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Sat, 12 May 2007 15:51:51 +0000 (15:51 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Sat, 12 May 2007 15:51:51 +0000 (15:51 +0000)
     and '44ac981166d3a9166289d07547721c3f3a859915'


Trivial merge