Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 24 Sep 2012 11:11:45 +0000 (15:11 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 24 Sep 2012 11:11:45 +0000 (15:11 +0400)

Trivial merge