Merge pull request #1485 from vpisarev:ipp_fixes
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Thu, 26 Sep 2013 07:09:57 +0000 (11:09 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 26 Sep 2013 07:09:59 +0000 (11:09 +0400)

Trivial merge