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

Trivial merge