Merge pull request #3353 from Chuanbo-Weng:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 28 Oct 2014 10:23:18 +0000 (10:23 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 28 Oct 2014 10:23:18 +0000 (10:23 +0000)

Trivial merge