printproto: Changes to 'master'

[James Cloos]

 .gitignore |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 378417f12b1a8839c2943822545e8a9a74543d6d
Merge: d284123... 4524de4...
Author: James Cloos <cloos at jhcloos.com>
Date:   Mon Sep 3 06:17:42 2007 -0400

    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/printproto

commit d284123348eeffdc8419144c7999c2b82b0cddc0
Author: James Cloos <cloos at jhcloos.com>
Date:   Mon Sep 3 05:54:11 2007 -0400

    Add *~ to .gitignore to skip patch/emacs droppings