Merge commit '8fe79738c' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:41:10 +0000 (16:41 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:41:10 +0000 (16:41 +0400)

Trivial merge