[tomcat-native/el6: 9/9] Merge branch 'master' into el6

[Ville Skyttä]

commit e015af6e73d8fc6adea4445a3604c881d76aa55b
Merge: 6b641db be8024f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Aug 9 11:56:57 2011 +0300

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	tomcat-native.spec

 .gitignore         |    2 +-
 sources            |    2 +-
 tomcat-native.spec |   11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
---