[gummi/f16: 6/6] Merge branch 'master' into f16

[Fabian Affolter]

commit 36c99d2d419121f28561033f7d17b72a82485616
Merge: 7bc54d5 5612dc9
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Aug 11 12:54:21 2012 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore

 .gitignore |    5 ++---
 gummi.spec |   13 +++++++++++--
 sources    |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 4d4878d,7553703..990dd44
--- a/.gitignore
+++ b/.gitignore
@@@ -5,7 -5,5 +5,6 @@@ gummi-0.4.8.tar.g
  /gummi-0.5.8-2.tar.gz
  /gummi-0.6.0.tar.gz
  /gummi-0.6.2.tar.gz
- <<<<<<< HEAD
- =======
  /gummi-0.6.3.tar.gz
- >>>>>>> master
+ /gummi-0.6.4.tar.gz
++