Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Tue, 7 Aug 2012 14:17:49 +0000 (18:17 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Tue, 7 Aug 2012 14:17:49 +0000 (18:17 +0400)

Trivial merge