merge of '38c8d04b074d2da5c68983c247ecf8522ed92c5c'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Mon, 9 Apr 2007 22:46:10 +0000 (22:46 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Mon, 9 Apr 2007 22:46:10 +0000 (22:46 +0000)
     and '8e4e5cd6606686e6371b5fa96e75e932ef9a097f'


Trivial merge