merge of 'b7d0f94193045f08368d5d44995efcc46bee860e'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Sun, 7 Jan 2007 00:16:02 +0000 (00:16 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Sun, 7 Jan 2007 00:16:02 +0000 (00:16 +0000)
     and 'd7ad7e9fb60baa5f043923ec878a0842fd6db64a'


Trivial merge