Merge branch 'fix-for-gcc47'

This branch was necessary to create the correct ref for the
MITK 2012-06 snapshot release though the fix was already in CTK master