For people following ubuntu-karmic.git, attaching frank's patches applied to the git tree. This is as of commit f296e92811aec89c51b9377263e4229196cf266f.
For people following ubuntu-karmic.git, attaching frank's patches applied to the git tree. c51b9377263e422 9196cf266f.
This is as of commit f296e92811aec89