[mr/f15: 2/2] Merge branch 'master' into f15

[Fabian Affolter]

commit 18e734c67fa008a7deecd336d54c52a69603d8c1
Merge: b33b977 8eba9b1
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Apr 5 21:49:01 2012 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore

 .gitignore |    5 ++---
 mr.spec    |    5 ++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 97ba8d5,c8584a3..ac6a089
--- a/.gitignore
+++ b/.gitignore
@@@ -6,8 -6,5 +6,7 @@@ mr_0.48.tar.g
  /mr_1.03.tar.gz
  /mr_1.04.tar.gz
  /mr_1.05.tar.gz
- <<<<<<< HEAD
 +/mr_1.06.tar.gz
- =======
  /mr_1.10.tar.gz
- >>>>>>> master
+ /mr_1.11.tar.gz
++