Merge branch 'master' of ssh://git.kitenet.net/srv/git/pristine-tar 1.11
authorJoey Hess <joey@kitenet.net>
Fri, 12 Nov 2010 14:31:35 +0000 (10:31 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 12 Nov 2010 14:31:35 +0000 (10:31 -0400)

Trivial merge