01-git merged
01-{camp,darcs} minor fixes
01-agda merged