[purple-msn-pecan/f12/master: 9/9] Merge branch 'master' into f12

[madko]

commit 39ce8431a267fa8bf08694d25212d70986662fd0
Merge: c30f630 5a011cc
Author: madko <madko at linuxed.net>
Date:   Mon Aug 30 21:04:38 2010 +0200

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	purple-msn-pecan.spec
    	sources

 .gitignore            |    4 ++++
 purple-msn-pecan.spec |    8 ++++++--
 sources               |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 5aa581f,7c6f83e..14e96ed
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  msn-pecan-0.1.0.tar.bz2
++<<<<<<< HEAD
++=======
+ /msn-pecan-0.1.1.tar.bz2
++>>>>>>> master