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

[Ville Skyttä]

commit fcebce5f99e32c66b5a864b9e2a66a8705fded60
Merge: 0f2f2bc 13c8ecf
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Oct 15 13:12:35 2013 +0300

    Merge branch 'master' into el6

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