gfrd/egfrd — pull request #61 by TheOtherOne (2012-02-14 11:11:37+00:00)
Title: Fix merge

Should fix the merge from Tomek and introduces a cleaner solution to the problem