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

[Fabian Affolter]

commit 4d8c34f44d5b0b08be1d9d4371a39bfa35fbf2d5
Merge: b0f8aa4 1eadefa
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Apr 7 10:16:17 2012 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore
    	gummi.spec
    	sources

 .gitignore                |    4 ++++
 gummi-0.6.0-linking.patch |   11 -----------
 gummi.spec                |   14 ++++++++++----
 sources                   |    4 ++++
 4 files changed, 18 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index 12512d2,7620ec6..4d4878d
--- a/.gitignore
+++ b/.gitignore
@@@ -5,3 -5,4 +5,7 @@@ 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
diff --cc sources
index 023e817,fbd16f9..e8d68c3
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +62dc8655ee3da8e09a6060e4ec9ebb21  gummi-0.6.2.tar.gz
++=======
+ 6d02259d237c35c149d6a5f61f76ad3e  gummi-0.6.3.tar.gz
++>>>>>>> master