Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Fri, 17 Aug 2012 13:32:20 +0000 (17:32 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Fri, 17 Aug 2012 13:32:20 +0000 (17:32 +0400)

Trivial merge