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)
commitd8dee2dbdd4179ab2be3b6fb181804e260f6fa2e
treed8408af465147d56e0aab33a3f87f96f578b6796
parent8f230b532b01946c51ef6a02dbac8832b9d59389
parentf8e6d309c31ae8cb1c5a7a29e1fe21a398f947eb
Merge ... 'a40e58b084ec71667a82bd3224987f976711d93e'
     and 'e549bf0a27ef25982b9db1bdc644fc97353ddd7b'