Merge pull request #2832 from BRAINSia:20140605_Upstream
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 19 Jun 2014 07:57:51 +0000 (11:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 19 Jun 2014 07:57:52 +0000 (11:57 +0400)
commitacebfcd24f1fe7d7a349770068da678675627766
tree90dad29706126078d85c8d93967b4682769e5489
parent65953fe39af2b625a1cb69c7e44b2561a3d4afad
parent4c7ed03b5f789c6f898223e595799d413c10f583
Merge pull request #2832 from BRAINSia:20140605_Upstream