fix for issue 378 COMPILE ERROR
Merge branch '1_7' of https://code.google.com/p/rapla into 1_7