[faenza-icon-theme/f14: 4/4] Merge remote-tracking branch 'origin/master' into f14

[Felix Kaechele]

commit 977326fb689e05fdfab41c0f1a7647384b84295b
Merge: 9eb8344 9f7dbe9
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sun Oct 23 21:54:31 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14

 .gitignore             |    2 +-
 faenza-icon-theme.spec |   90 ++++++++++++++++++++++++++----------------------
 sources                |    2 +-
 3 files changed, 51 insertions(+), 43 deletions(-)
---
diff --cc .gitignore
index 1a92f18,0d5de64..e214bef
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Faenza_Icons_by_tiheum.zip
+ /faenza-icon-theme_1.1.tar.gz