[python-mechanize/el5/master: 9/9] Merge branch 'f13' into el5

[Luke Macken]

commit 8f5eafe73ebdb1d107569fc911a9b20474dd0dec
Merge: 9a3a0c3 10e7048
Author: Luke Macken <lmacken at redhat.com>
Date:   Thu Jan 20 15:33:34 2011 -0500

    Merge branch 'f13' into el5
    
    Conflicts:
    	.gitignore

 python-mechanize.spec |   28 ++++++++++++++++++++++++----
 sources               |    2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)
---