changes merged

2010-06-02, laurent