- hopefully fixed shadow this time finally (from the department: how many errors can you possibly make in 10 lines of code)
- hopefully fixed shadow this time finally (from the department: how many errors can you possibly make in 10 lines of code)

git-svn-id: e38e7cdd6ace00d8230583a2d3b43e9a55f5c011@700 bc4816be-ef27-423a-9c4d-fc420be121a2

reprise/reprise-framework,reprise/reprise-framework