Merge branch 'master' into next

* master:
Merge branch 'tl/anno'
cvsserver: better error messages
cvsserver: nested directory creation fixups for Eclipse clients
Merge branch 'maint'
tar-tree: file/dirmode fix.