master treeMerge branch 'master' of git://github.com/pydata/conda into addons
fixed issue #476