This is completly untested. Only a compile tests with the default config was done! SVN-Revision: 17734
