OpenCV 2.4.6.1

This commit builds on top of pull request https://github.com/Homebrew/homebrew-science/pull/223.