[shutter/f12/master: 10/10] Merge branch 'master' into f12/master

[Liang Suilong]

commit 7075647b24fa8f7aa74430a95d966a84a4501005
Merge: 529e40e cc5c54e
Author: Fedora <liangsuilong at gmail.com>
Date:   Mon Sep 13 19:40:33 2010 +0800

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

 .gitignore   |    1 -
 shutter.spec |    9 +++++++--
 sources      |    3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc sources
index a44cb54,aa1369c..2863e74
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
- 7261c53d5e36b0c7c32aaba2a3714384  shutter-0.86.2.tar.gz
+ 874a4b5a113d81f4c83bc67b5a4a029a  shutter-0.86.4.tar.gz
++