Taking the trunk from launchpad and applying a
a patch to the mainline