Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Tue, 31 Jul 2012 13:18:35 +0000 (17:18 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Tue, 31 Jul 2012 13:18:35 +0000 (17:18 +0400)

Trivial merge