Merge pull request #3232 from Chuanbo-Weng:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 18 Sep 2014 11:48:29 +0000 (11:48 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 18 Sep 2014 11:48:29 +0000 (11:48 +0000)

Trivial merge