OpenCV is now in branch opencv_dev.
Merged.