Merge pull request #1397 from ilya-lavrenov:gitignore
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 4 Sep 2013 10:16:37 +0000 (14:16 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 4 Sep 2013 10:16:37 +0000 (14:16 +0400)

Trivial merge