[python-mechanize/el6: 10/11] Merge branch 'master' into el6

[Luke Macken]

commit 7f0765728a978db086febdf4eecef2c654733eea
Merge: 30ff9e9 557dc69
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Sep 21 15:55:38 2011 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 python-mechanize.spec |   46 +++++++++++++++++++++++++++++++++++++---------
 sources               |    2 +-
 2 files changed, 38 insertions(+), 10 deletions(-)
---