resolve merge noise in favor of new upstream. note that this tosses out the
[debian/gzip] / .gitignore
2010-04-20 Bdale GarbeeMerge commit 'upstream/1.4'
2009-02-27 Carl WorthAdd .gitignore files for generated files