Merge pull request #311 from cuda-geek:soft-cascade-refactoring-and-fixes
authorcuda-geek <marina.kolpakova@itseez.com>
Mon, 21 Jan 2013 20:27:01 +0000 (00:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 21 Jan 2013 20:27:02 +0000 (00:27 +0400)

Trivial merge