[linux_logo/el6: 7/7] Merge branch 'master' into el6

[Matthias Saou]

commit ebffe093ebf41b00118fcf7ffba3d37bd60423bb
Merge: a86fffb 4d17931
Author: Matthias Saou <thias at marmotte.net>
Date:   Sat Jul 9 23:57:26 2011 +0200

    Merge branch 'master' into el6

 .gitignore      |    3 ++-
 linux_logo.spec |   24 +++++++++++++++---------
 sources         |    2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index 48dee31,faa9648..b5afc86
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
--linux_logo-5.10.tar.gz
++/linux_logo-5.10.tar.gz
+ /linux_logo-5.11.tar.gz