[kmess/f13/master: 5/5] Merge remote-tracking branch 'origin/master' into f13

[Rex Dieter]

commit 5c229218498dcf29f025f13a59d16f472c213df8
Merge: 76a218c 72cddb6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 16 11:06:36 2011 -0500

    Merge remote-tracking branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                                        |    3 +-
 kmess-2.0.6.1-kmesssendpluginlib_dsolinking.patch |   17 ++++++
 kmess-2.0.6.1-kmesssendpluginlib_static.patch     |   12 ++++
 kmess.spec                                        |   59 +++++++++++++++++----
 sources                                           |    2 +-
 5 files changed, 81 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index b004842,e4e440c..a97b4ea
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,2 @@@
- kmess-2.0.5.tar.bz2
 -kmess-2.0.3.tar.gz
 -/kmess-2.0.4.tar.bz2
+ /kmess-2.0.5.tar.bz2
+ /kmess-2.0.6.1.tar.bz2