Merge branch 'Itseez-2.4' into Feature_3692_2.4
authorHernan Badino <hernan.badino@gmail.com>
Tue, 20 May 2014 13:28:11 +0000 (09:28 -0400)
committerHernan Badino <hernan.badino@gmail.com>
Tue, 20 May 2014 13:28:11 +0000 (09:28 -0400)

Trivial merge