Merge pull request #1200 from shervinemami:patch-1
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 29 Jul 2013 11:31:36 +0000 (15:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 29 Jul 2013 11:31:36 +0000 (15:31 +0400)

Trivial merge