Merge pull request #3334 from micha137:patch-2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 15 Oct 2014 10:32:16 +0000 (10:32 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 15 Oct 2014 10:32:16 +0000 (10:32 +0000)

Trivial merge