Merge branch 'darcs'