[shutter/f13/master: 11/11] Merge branch 'f12/master' into f13/master

[Liang Suilong]

commit e37e6671f1fee99f04dbb40f27676cfcf20411bf
Merge: bc31f20 df7e12f
Author: Fedora <liangsuilong at gmail.com>
Date:   Mon Sep 13 19:53:11 2010 +0800

    Merge branch 'f12/master' into f13/master
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore |    3 +++
 sources    |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 231cdc1,27611eb..70df0e0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,1 +1,8 @@@
++<<<<<<< HEAD
 +shutter-0.86.2.tar.gz
 +<<<<<<< HEAD
 +=======
++=======
++>>>>>>> f12/master
  /shutter-0.86.4.tar.gz
 +>>>>>>> master
diff --cc sources
index 65518cc,2863e74..6078b9a
--- a/sources
+++ b/sources
@@@ -1,2 -1,2 +1,6 @@@
  874a4b5a113d81f4c83bc67b5a4a029a  shutter-0.86.4.tar.gz
++<<<<<<< HEAD
 +>>>>>>> master
++=======
+ 
++>>>>>>> f12/master