Merge pull request #1225 from apavlenko:fix_format_security
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 5 Aug 2013 08:58:37 +0000 (12:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 5 Aug 2013 08:58:37 +0000 (12:58 +0400)

Trivial merge