Merge pull request #3034 from jet47:fix-compilation
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 4 Aug 2014 09:38:34 +0000 (09:38 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 4 Aug 2014 09:38:34 +0000 (09:38 +0000)

Trivial merge