fix some conflicts that for some reason weren't resolved during the last cherry-picks
[citadel.git] / contrib /
2007-12-15 Wilfried Göesgens* buildfarm scripts for the packages