Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)

Trivial merge