Merge pull request #2361 from alekcac:ios_camera_changes
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 18 Feb 2014 11:44:56 +0000 (15:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 18 Feb 2014 11:44:56 +0000 (15:44 +0400)

Trivial merge