[linux_logo/el5: 16/16] Merge branch 'master' into el5

[Matthias Saou]

commit 9a8c39b82c0c9e86a8ed0f75edc430501baa39a7
Merge: a6f8076 4d17931
Author: Matthias Saou <thias at marmotte.net>
Date:   Sun Jul 10 00:08:05 2011 +0200

    Merge branch 'master' into el5

 .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