fixed gforge header selection
Merge branch 'master' into debian
cleanup