Kludge so that OpenCV builds with linxbrew
Merge branch 'master' of https://github.com/Homebrew/homebrew-science

Conflicts:
	opencv.rb