Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 19 Oct 2012 11:07:12 +0000 (15:07 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 19 Oct 2012 11:07:12 +0000 (15:07 +0400)

Trivial merge