Merge pull request #3140 from braindevices:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 22 Aug 2014 07:17:36 +0000 (07:17 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 22 Aug 2014 07:17:36 +0000 (07:17 +0000)

Trivial merge