[libXcm/f12/master: 4/4] Resolve Merge branch 'master' into f12

[Nicolas Chauvet]

commit 9e0fe146eccd3b0019cb8111a5353f8a8e160b7e
Merge: ac006d0 96979ff
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sun Aug 22 12:13:03 2010 +0200

    Resolve
    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	libXcm.spec
    	sources

 .gitignore  |    2 +-
 libXcm.spec |    9 +++++----
 sources     |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index d444d4d,f506a90..a69804c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--libXcm-0.2.6.tar.gz
+ /libXcm-0.2.7.tar.gz