[tigase-xmltools/f13/master: 6/6] Merge branch 'master' into f13

[Matej Cepl]

commit 26d2c5d97a5f8bf08f974ffa3544afdf4a806e02
Merge: f7f1885 912c610
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Oct 19 14:12:47 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	tigase-xmltools.spec

 .gitignore           |    5 +++++
 sources              |    2 +-
 tigase-xmltools.spec |   12 ++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 0726143,f2cd8af..b659025
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,6 @@@
  tigase-xmltools-3.3.4.tar.bz2
++<<<<<<< HEAD
++=======
+ /tigase-xmltools.tar.bz2
+ /tigase-xmltools-3.3.5.tar.bz2
++>>>>>>> master