Merge pull request #1212 from jet47:gpu-calc-hist
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 2 Aug 2013 09:23:03 +0000 (13:23 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 2 Aug 2013 09:23:04 +0000 (13:23 +0400)

Trivial merge