Merge pull request #2068 from akarsakov:disable_ipp
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 26 Dec 2013 18:41:52 +0000 (22:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 26 Dec 2013 18:41:52 +0000 (22:41 +0400)

Trivial merge