[python-cherrypy/el6: 14/14] Merge branch 'master' into el6

[Matthias Runge]

commit a993aff58e46d3f19eef9313bf855ce45ff140df
Merge: 0c000df 2e42e45
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed Oct 31 13:36:20 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 cherrypy-unittest.patch                   |   11 ++++++
 python-cherrypy-changederrormessage.patch |   21 ++++++++++++
 python-cherrypy-tutorial-doc.patch        |   19 ++++++-----
 python-cherrypy.spec                      |   51 +++++++++++++++++++++++------
 sources                                   |    2 +-
 5 files changed, 84 insertions(+), 20 deletions(-)
---