Merge remote-tracking branch 'jon/silence-generated'
authorJoey Hess <joey@kitenet.net>
Thu, 21 Apr 2011 18:18:02 +0000 (14:18 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 21 Apr 2011 18:18:02 +0000 (14:18 -0400)

Trivial merge