Merge pull request #3312 from berak:b_3945_30
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 8 Oct 2014 08:40:55 +0000 (08:40 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 8 Oct 2014 08:40:55 +0000 (08:40 +0000)

Trivial merge