Merge branch 'branch-2.1' of https://github.com/michaelrsweet/cups into branch-2.1

diff --cc .gitignore
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..1a00a39045fe2aa10fbbac29927e9db00d21c102
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.gitignore
@@@ -1,0 -1,0 +1,6 @@@
++autom4te.cache
++config.h
++config.log
++config.status
++cups-config
++Makedefs