Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 10 Dec 2012 19:51:14 +0000 (23:51 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 10 Dec 2012 19:51:34 +0000 (23:51 +0400)

Trivial merge