marina.kolpakova a6c3ed5b36 Merge branch master into cuda-dev		2012-12-11 01:12:14 +04:00
..
opencv2/highgui	Merge branch master into cuda-dev	2012-12-11 01:12:14 +04:00