Actually, I tried to email Cep about merging this into cvs (and some other questions), but apparently he doesn't get my mails. First one (of four in total) is from nine days ago, and still no reply…
Cep, please contact me!
Maybe any other of the developers want to jump in here ?
Not necessary anymore, Cep contacted me yesterday, and everything is on it's way. Tests are passed, and in a week (to wait if more similar problems arise in the meantime) the fixes will be in cvs.