cmake update - 21.04.2012
Merge pull request #132 from mkrivos/small_fixes

cmake update - 21.03.2012