Merge remote-tracking branch 'schmonz/cvs'
authorJoey Hess <joey@kitenet.net>
Sat, 2 Feb 2013 23:39:25 +0000 (10:39 +1100)
committerJoey Hess <joey@kitenet.net>
Sat, 2 Feb 2013 23:39:25 +0000 (10:39 +1100)

Trivial merge