Upstream patch to fix performance regression in virt-builder (RHBZ#1188866).
    
    - Change the way Python double-build is done so we only have to
      apply patches in one place.