Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emerge-hack: A new script for Git merging.
  vncrc, xinitrc: Don't do so much Gnome fiddling.
  dot-emacs: Fiddle C indentation settings.
  emacs: Make postscript printing more sensible.

diff --combined dot-emacs.el
index 55bd054,1a1b90a..e2e8998
--- 1/dot-emacs.el
--- 2/dot-emacs.el
+++ b/dot-emacs.el
@@@ -605,9 -605,6 +605,9 @@@ doesn't cope with anything approximatin
      (mdw-number-face :foreground "yellow")
      (font-lock-function-name-face :weight bold)
      (font-lock-variable-name-face :slant italic)
 +    (font-lock-comment-delimiter-face
 +       :foreground ,(if window-system "SeaGreen1" "green")
 +       :slant italic)
      (font-lock-comment-face
         :foreground ,(if window-system "SeaGreen1" "green")
         :slant italic)
@@@ -661,7 -658,7 +661,7 @@@
                                  (label . 0)
                                  (case-label . +)
                                  (access-label . -)
-                                 (inclass . ++)
+                                 (inclass . +)
                                  (inline-open . ++)
                                  (statement-cont . 0)
                                  (statement-case-intro . +)))