Merge origin/master into cuda-dev
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 26 Nov 2012 14:54:29 +0000 (18:54 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 26 Nov 2012 14:56:33 +0000 (18:56 +0400)

Trivial merge