[tomcat6/f13/master: 2/2] Changelog entry for rhbz#575341

[Dave Knox]

commit 21f1fc33ecaeb1f102561d82a19abec2c40c3028
Merge: 3d9e786 fdab689
Author: david knox <dknox at 78-97-42-72.skybeam.com>
Date:   Wed Sep 29 14:55:47 2010 -0600

    Changelog entry for rhbz#575341

 tomcat6.spec |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --cc tomcat6.spec
index 73894e5,f3a0241..53d63aa
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@@ -608,8 -597,10 +608,15 @@@ f
  %{appdir}/sample
  
  %changelog
 +<<<<<<< HEAD
++<<<<<<< HEAD
++=======
 +=======
+ * Fri Jul 02 2010 David Knox <dknox at rehat.com> 0:6.0.26-9
+ - Resolves rhbz#575341 - Additionally created instances of Tomcat 
+ - are broken
+ 
++>>>>>>> master
  * Fri Jul 02 2010 David Knox <dknox at rehat.com> 0:6.0.26-8
  - LSB initscript compliance