Mistakes in my yesterday evening patches

[Laurent Vromman]

I have send 4 patches yesterday. The 2 first of them are tagged
resend.

Please do not take those two first patches into account, they have
already been merged in the git tree. My proxy played me a trick, i
haven't see that before I sent them again.   
 Only the 2 last ones (3/4 and 4/4) are to be merged by now.  
 Sorry for my mistake,  
 Laurent