Merge pull request #1447 from Siddharthk:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 5 Dec 2013 08:38:12 +0000 (12:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 5 Dec 2013 08:38:12 +0000 (12:38 +0400)

Trivial merge