Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Fri, 31 Aug 2012 10:56:09 +0000 (14:56 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Fri, 31 Aug 2012 10:56:09 +0000 (14:56 +0400)

Trivial merge