Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 21 Jan 2014 19:27:15 +0000 (23:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 21 Jan 2014 19:27:16 +0000 (23:27 +0400)

Trivial merge