Tobias Doerffel - 2006-08-18

Patchset for more compat of code