more resolver stuff
Merge branch 'master' of https://github.com/fniksic/mpi-sws-vscomp
Merge branch 'master' of https://github.com/fniksic/mpi-sws-vscomp
Merge branch 'master' of https://github.com/fniksic/mpi-sws-vscomp