Merge remote-tracking branches 'distorted/master' and 'ponder/master'
authorMark Wooding <mdw@distorted.org.uk>
Sat, 25 Jun 2011 13:25:49 +0000 (14:25 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 25 Jun 2011 13:25:49 +0000 (14:25 +0100)
* distorted/master:
  bin/mdw-conf, dot/bashrc, setup: Portability fixes.

* ponder/master:
  dot/lisp-init.lisp: Make sure that ASDF is available.


Trivial merge