[elementary-icon-theme/f14: 4/4] Merge branch 'master' into f14

[hannes]

commit d716c503190b5cbd2e1a42944514878262144c81
Merge: 31012e7 f572462
Author: johannes lips <johannes at fedorabox.localdomain>
Date:   Thu May 26 19:29:32 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	elementary-icon-theme.spec
    	sources
    
    Update to recent upstream version

 .gitignore                 |    4 ++++
 elementary-icon-theme.spec |   33 ++++++++++++++++++---------------
 sources                    |    4 ++++
 3 files changed, 26 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index 4755f4b,f5343ca..e7b910e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  /elementary_Icons_by_DanRabbit.zip
++<<<<<<< HEAD
++=======
+ /elementary-icon-theme-2.7.1.tar.gz
++>>>>>>> master
diff --cc sources
index e103e17,a2799f6..fc3e0d4
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +5eab2f798b7bebe1fb1f346c3ab13d3b  elementary_Icons_by_DanRabbit.zip
++=======
+ fc4580641089a09cbcf7df38ebddd807  elementary-icon-theme-2.7.1.tar.gz
++>>>>>>> master