merge of 'a40e58b084ec71667a82bd3224987f976711d93e'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Tue, 3 Apr 2007 21:43:23 +0000 (21:43 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Tue, 3 Apr 2007 21:43:23 +0000 (21:43 +0000)
     and 'e549bf0a27ef25982b9db1bdc644fc97353ddd7b'


Trivial merge