Merge pull request #939 from pengx17:2.4_getDevice
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Jun 2013 09:33:21 +0000 (13:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Jun 2013 09:33:21 +0000 (13:33 +0400)

Trivial merge