Merge pull request #3605 from jet47:cuda-photo-refactoring
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 Jan 2015 10:48:44 +0000 (10:48 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 19 Jan 2015 10:48:44 +0000 (10:48 +0000)

Trivial merge