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

Trivial merge