Itseez/opencv — pull request #1154 by bitwangyaoyao (2013-07-19 05:47:03+00:00)
Title: Fix ocl::haar's problems caused by merge.

The interfaces are also simplified.