vkohaupt/vokoscreen — pull request #35 by Lasall (2013-07-07 10:48:20+00:00)
Title: Fix git-merge framents.

Fix compilation error due to merge fragments.