Merge pull request #3098 from jet47:fix-cuda-compilation
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Aug 2014 10:05:49 +0000 (10:05 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Aug 2014 10:05:49 +0000 (10:05 +0000)

Trivial merge