Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu'
authormarina.kolpakova <marina.kolpakova@itseez.com>
Tue, 13 Nov 2012 19:37:44 +0000 (23:37 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Tue, 13 Nov 2012 19:37:44 +0000 (23:37 +0400)

Trivial merge