[MERGE] Upgrade ConfigObj to 4.6.0

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matt Nordhoff wrote:
> [Sorry about not including the diff in the merge directive but I've
> tried to send this message twice and it hasn't gone through, so now I'm
> trying this. If it turns out that they're being held by Mailman, um,
> sorry for the duplicates.]
> 
> Hi,
> 
> This patch upgrades Bazaar's bundled copy of ConfigObj from 4.5.2 to 4.6.0.
> 
> ConfigObj has made some changes to the documentation files, getting rid
> of the ones Bazaar versioned, so I just deleted them all since they
> aren't necessary anyway.
> 
> There's some extra noise in the patch because I changed "has_key" to
> "in" without noticing that I hadn't bothered to make that change to
> 4.5.2. Sorry about that. I can revert it again, but I don't see any need
> to. [Plus it would be a pain. :-P ]
> 
> The test suite passes, but I haven't tried running with it or anything.
> I also haven't measured performance.
> 

BB:comment

I'm not specifically against upgrading, but do we know if we gain any
benefit from this?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknrGkwACgkQJdeBCYSNAAP8ZgCdGbhOrr2/40gHv/+MjdHEBGQc
sWMAn25Egpp3wyUTHo+M1qL1iJrtngmy
=GCnm
-----END PGP SIGNATURE-----