Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
authorSuenghoon Park <pclove1@gmail.com>
Wed, 26 Dec 2012 22:40:38 +0000 (17:40 -0500)
committerSuenghoon Park <pclove1@gmail.com>
Wed, 26 Dec 2012 22:40:38 +0000 (17:40 -0500)

Trivial merge