Merge pull request #2137 from ilya-lavrenov:gitignore
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 13 Jan 2014 12:33:15 +0000 (16:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 13 Jan 2014 12:33:16 +0000 (16:33 +0400)

Trivial merge