Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:16:48 +0000 (14:16 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:16:48 +0000 (14:16 +0400)

Trivial merge