Ben,
please consider patch 7, 8 and 9 of the following patch series for
upstream submission:
http://n2.nabble.com/-PATCH-0-9--Dependency-fixes-for-%22proposed%22-td2404485ef1958.html
Your didn't react to my last mail, so I simply resend it...
Best regards,
Sven