[python-werkzeug/f12/master: 6/6] Merge remote branch 'origin/f14/master' into f12

[Peter Halliday]

commit 5f05620fa1ad9e1acd50f9f695d15f64b016d0da
Merge: d635233 e6cb990
Author: Peter Halliday <phalliday at excelsiorsystems.net>
Date:   Fri Sep 17 23:05:54 2010 -0400

    Merge remote branch 'origin/f14/master' into f12
    
    Conflicts:
    	python-werkzeug.spec

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