Merge pull request #1239 from Daniil-Osokin:fix_build_of_camera_calibration_android_s...
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 9 Aug 2013 13:45:21 +0000 (17:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 9 Aug 2013 13:45:21 +0000 (17:45 +0400)

Trivial merge