Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 22 Oct 2012 09:16:27 +0000 (13:16 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 22 Oct 2012 09:16:27 +0000 (13:16 +0400)

Trivial merge