Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Tue, 9 Oct 2012 17:52:56 +0000 (21:52 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Tue, 9 Oct 2012 17:52:56 +0000 (21:52 +0400)

Trivial merge