CLJ(S) fixes for ASYNC-5
Merge branch 'master' of http://github.com/clojure/core.async