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)
commitd9ffe5e7c4b349d2314475c754de6b616a0f3143
treecbf354b8ad30c60c29b40fe78f159a6ed99a0da6
parentcb66dd8000880789dc5b6e86a5f7e1fe4debc02d
parent546ec2af6519398a49555d5e4e2b383a4083e76f
Merge branch '2.4'