[tomcat-native/el6: 4/4] Merge commit '92435d708c90f3f3a48e3ebe7c4a4d8c2add7e23' into el6

[Ville Skyttä]

commit 8d603d2760c13847e7af8fbe3a47cc880b7da21c
Merge: e015af6 92435d7
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Sep 19 00:18:11 2012 +0300

    Merge commit '92435d708c90f3f3a48e3ebe7c4a4d8c2add7e23' into el6

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