Merge remote branches 'ponder' and 'crybaby'
authorMark Wooding <mdw@distorted.org.uk>
Thu, 6 May 2010 14:28:22 +0000 (15:28 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 6 May 2010 14:28:22 +0000 (15:28 +0100)
* ponder:
  dot/gnus.el: Hack for closing the summary view.
  dot/bashrc: Minor options tweaks.

* crybaby:
  dot/bash_profile: Use gnome-keyring-daemon's SSH agent if available.


Trivial merge