Just to point out the obvious: the first diff should be between administration and savane-cleanup *before* any of your changes.
Along those lines, please don't speak of a "savane" repository when you mean "administration". This is one of the most confusing aspects of the whole system, and we gain nothing by compounding it now. thanks, k
