gconf2: new changes from Debian require merging

[Merge-o-Matic]

New changes from Debian require merging into Ubuntu.

Some, if not all, of this work has been done automatically;
however the changes should be reviewed before signing and
uploading.

The new source package, along with various patches to aid
your review are available at:

        http://people.ubuntu.com/~scott/ongoing-merge/gconf2/

In particular see the REPORT file for details.

If this is the first time you have received one of these
bugs, or are just unsure what to do, see:

        http://people.ubuntu.com/~scott/ongoing-merge/README

 -- Your friendly neighbourhood Merge-O-Matic.

[Sebastien Bacher (seb128)]

*** Bug 28133 has been marked as a duplicate of this bug. ***

[Merge-o-Matic (mom-ubuntu)]

This is a reminder, further changes have occurred in Debian
since this report was filed. The URL above has been updated
with the new source package.

[Sebastien Bacher (seb128)]

I'll sync that

[Scott James Remnant (Canonical) (canonical-scott)]

Old merge -- thrown away as all the details are wrong