Create a git attributes file in the overlay.

And set the `merge=ours` strategy on the `debian/changelog` and
`debian/NEWS` files, which should never have a shared history.

Rather, when one `master/*` branch is merged into another, this should
prevent the accidental cross contamination of unrelated objects.
Merge branch 'master-legacy' into master/ubuntu/quantal