Itseez/opencv — pull request #3163 by StevenPuttemans (2014-08-27 11:51:33+00:00)
Title: continue fixing nonfree elements

Continuing my efforts from https://github.com/Itseez/opencv/pull/3149
Some little changes I forgot.