Build fixes for MSVC 2005
Make sure that the const-decorations are the same in the .cpp file

CCMAIL: ynezz@true.cz
Merge branch 'msvc-fixes'

REVIEW: 110823