temporary fix
temporarely disabling my patches
Merge commit 'refs/top-bases/experimental/cups-1.6-and-1.7' into experimental/cups-1.6-and-1.7

* commit 'refs/top-bases/experimental/cups-1.6-and-1.7':
  temporary fix
Merge branch 'experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/marc

* experimental/cups-1.6-and-1.7:
  temporary fix
Merge branch 'experimental/nix' into refs/top-bases/experimental/marc

* experimental/nix:
  temporarely disabling my patches
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  temporarely disabling my patches
  temporary fix