Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'
authorJoey Hess <joey@kitenet.net>
Tue, 27 Aug 2013 20:48:25 +0000 (16:48 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 27 Aug 2013 20:48:25 +0000 (16:48 -0400)

Trivial merge