Fold in frame-unwind patch

After moving to svn there's no need to avoid pulling files off a vendor
branch.