Merge commit 'remotes/smcv/gitignore'
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 27 Jul 2009 07:34:26 +0000 (09:34 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 27 Jul 2009 07:34:26 +0000 (09:34 +0200)

Trivial merge