I'm going to ``merge'' the trunk against cleanup-2008, by applying patches from the trunk since the last merge (r2189) on top of cleanup-2008, one by one. This will be done using to `svn-cherry-pick' (from revision r2189). The idea is, after this merge is complete, we shouldn't use trunk/ anymore (except if you have a good reason for). We'll merge back cleanup-2008 into the trunk later, and get rid of cleanup-2008. So, please: /*-----------------------------------. | Don't commit to trunk/ as of now! | `-----------------------------------*/ If you still want to commit to trunk, please tell us, either by talking to Théo and/or Roland or by sending an e-mail to olena-patches@lrde.epita.fr. TIA!