Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 8 Oct 2012 18:00:40 +0000 (22:00 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 8 Oct 2012 18:00:40 +0000 (22:00 +0400)

Trivial merge