update patch
update kwallet
update patch
Use dfaure's patch to prevent header clash