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

Trivial merge