Merge branch 'file_pruned_revamp'
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 22:18:39 +0000 (18:18 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 22:18:39 +0000 (18:18 -0400)

Trivial merge