Merge pull request #3149 from StevenPuttemans:fix_nonfree_includes
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 Aug 2014 16:03:53 +0000 (16:03 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 Aug 2014 16:03:53 +0000 (16:03 +0000)

Trivial merge