Merge commit 'master' into development
authorNathan Bird <nathan@acceleration.net>
Fri, 29 Jan 2010 19:22:04 +0000 (14:22 -0500)
committerNathan Bird <nathan@acceleration.net>
Fri, 29 Jan 2010 19:22:04 +0000 (14:22 -0500)
commit90ce2284fab5f1daedb8aa6aba3008a5c3651e30
tree7b8042f5c3e03ba67e3c919bb21848716372bd3e
parent8456b79be8685d58e341aaadbdb9063a42729304
parente7a577db720298ca6152c2da92f4aed647ee43c8
Merge commit 'master' into development

Conflicts:
tests/test-init.lisp  --pretty small.
tests/test-init.lisp