Merge pull request #1048 from SpecLad:xls-conf
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 26 Jun 2013 12:53:50 +0000 (16:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Jun 2013 12:53:50 +0000 (16:53 +0400)

Trivial merge