[tomcat6/f13/master: 3/3] Merge branch 'master' into f13

[Dave Knox]

commit 9ecff9d823f8044aaa5fd5c3ac8d86cc3ca0889c
Merge: feacf59 1bb926e
Author: david knox <dknox at 78-97-42-72.skybeam.com>
Date:   Tue Oct 5 09:58:22 2010 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    	tomcat6.spec

 tomcat6-6.0-CVE-2010-2227.patch |  138 +++++++++++++++++++++++++++++++++++++++
 tomcat6.spec                    |   15 +++--
 2 files changed, 148 insertions(+), 5 deletions(-)
---