Merge pull request #2608 from Siddharthk:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 1 Aug 2014 09:13:32 +0000 (09:13 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 1 Aug 2014 09:13:32 +0000 (09:13 +0000)

Trivial merge