Merge pull request #3173 from rokm:cuda-6.5
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 1 Sep 2014 10:38:43 +0000 (10:38 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 1 Sep 2014 10:38:43 +0000 (10:38 +0000)

Trivial merge