Merge pull request #3174 from rokm:samples-fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 2 Sep 2014 15:52:56 +0000 (15:52 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 2 Sep 2014 15:52:56 +0000 (15:52 +0000)

Trivial merge