Merge pull request #3270 from boaz001:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 16 Oct 2014 10:09:28 +0000 (10:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 16 Oct 2014 10:09:28 +0000 (10:09 +0000)

Trivial merge