[python-werkzeug/el6/master: 8/8] Merge branch 'el5' into el6

[Peter Halliday]

commit c73ef6dd651a961dea2db5a860f4dedcdf0708ff
Merge: d3acd91 419ec35
Author: Peter Halliday <phalliday at excelsiorsystems.net>
Date:   Tue Aug 31 21:49:01 2010 -0400

    Merge branch 'el5' into el6
    
    Conflicts:
    	python-werkzeug.spec

 python-werkzeug.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---