[python-cherrypy2/el6: 11/11] Merge branch 'master' into el6

[Toshio くらとみ]

commit 6d983c8d726d3d8d525cef71e2bc68320197ca26
Merge: 6d7ab4d 7715984
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Jul 20 13:37:52 2012 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	python-cherrypy2.spec

 python-cherrypy-2.3.0-EPIPE.patch           |   27 +++++++++++++++++++
 python-cherrypy-2.3.0-broken_tests.patch    |   12 ++++++++
 python-cherrypy-2.3.0-py27_exceptions.patch |   34 ++++++++++++++++++++++++
 python-cherrypy2.spec                       |   37 +++++++++++++++++++++------
 4 files changed, 102 insertions(+), 8 deletions(-)
---