Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Fri, 3 Aug 2012 12:14:38 +0000 (16:14 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Fri, 3 Aug 2012 12:14:38 +0000 (16:14 +0400)

Trivial merge