From: Bruno Lalande (bruno.lalande_at_[hidden])
Date: 2008-07-05 12:36:58
> Merge done: if you can cast a critical eye over the Trunk to make sure I
> haven't messed anything up then that would be great!
All right, I checked the diffs of the different files involved and
passed the test suite again with success, so I think everything's OK.
Thanks
Bruno