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

[Fabian Affolter]

commit 403de159933a386d2af8b81d19a3d090f215a117
Merge: 5423536 8eba9b1
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Apr 5 21:40:50 2012 +0200

    Merge branch 'master' into f16

 .gitignore |    1 +
 mr.spec    |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 522f914,c8584a3..dfe2de7
--- a/.gitignore
+++ b/.gitignore
@@@ -6,8 -6,5 +6,9 @@@ 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
 +=======
 +>>>>>>> master
  /mr_1.10.tar.gz
+ /mr_1.11.tar.gz