alt wip
Merge branch 'master' of github.com:clojure/core.async

Conflicts:
	src/clj/core/async.clj