Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Wed, 10 Oct 2012 12:16:05 +0000 (16:16 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Wed, 10 Oct 2012 12:16:05 +0000 (16:16 +0400)

Trivial merge