Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 9 May 2008 21:25:00 +0000 (22:25 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 9 May 2008 21:25:00 +0000 (22:25 +0100)
* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: In programming modes (at least) treat `------' as a page boundary.


Trivial merge