Commit
Merge
Merge branch 'master' of http://github.com/xbsd/scipy_2014