Merge branch 'android-toolchain'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 4 Sep 2012 13:00:40 +0000 (17:00 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 4 Sep 2012 13:10:52 +0000 (17:10 +0400)

Trivial merge