This replaces the old patch with the version from Florian. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46504
This only removes the patches already applied upstream and makes the rest apply cleanly. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46128