making it compatible with opencv 2.4.5
Merge branch 'opencv2.4.5_and_extras'