[python-werkzeug/f13/master: 5/5] Merge remote branch 'origin/f14/master' into f13

[Peter Halliday]

commit 9a3baf5469322dbb783418406cc297bcbe610ae6
Merge: 8bc0695 e6cb990
Author: Peter Halliday <phalliday at excelsiorsystems.net>
Date:   Fri Sep 17 22:53:34 2010 -0400

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

 .gitignore           |    2 +-
 python-werkzeug.spec |   13 ++++++++++---
 sources              |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---