It is already marked as a gtest 1.7.0

Merge branch '2.4_ocl_bfmatcher_newtype' of https://github.com/pengx17/opencv into 2.4_ocl_bfmatcher_newtype

RadiusMatch for HammingDist cannot pass yet.

This issue seem to be lingering around for quite some time
https://github.com/Itseez/opencv/pull/639
http://code.opencv.org/issues/2819

Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.

This allows subclasses of CvBoost to override initial weights that
update_weights uses without duplicating its entire implementation.