Restored changes from r4284 that were lost in r4297

git-svn-id: http://svn.montala.net/svn/resourcespace@4354 c08608d7-6e46-0410-86ca-f2a6f1370df5