merge of 'cd87faafb1baaea21105f7e6c92532f906050469'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Wed, 4 Apr 2007 18:48:50 +0000 (18:48 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Wed, 4 Apr 2007 18:48:50 +0000 (18:48 +0000)
commitf7f9843c498125c0c1235ff3ff9039860e03ef02
treef72ca753f152775e636fd2988bcf9227f741ab20
parentaecf5148eee745bfcae4de372c741ed1f207af3a
parent2572cbe44f1f681f13d981c8cff159f6b732efa4
Merge ... 'cd87faafb1baaea21105f7e6c92532f906050469'
     and 'ea691c5d58c6ea052d5fb36c169cfbedfea096b3'