[darktable/f14/master: 11/11] Merge branch 'master' into f14

[madko]

commit 2cbc8139eb20b0f164194e7464bd14bf38c6c34f
Merge: d2dd0e5 a940de2
Author: Edouard <madko at linuxed.net>
Date:   Wed Feb 16 14:45:16 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	darktable.spec
    	sources

 .gitignore     |    4 ++++
 darktable.spec |   32 +++++++++++++++++++++++---------
 sources        |    4 ++++
 3 files changed, 31 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index d6845d3,af9519f..e62f50e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,7 @@@
  /darktable-0.6.tar.gz
  /darktable-0.7.tar.gz
  /darktable-0.7.1.tar.gz
++<<<<<<< HEAD
++=======
+ /darktable-0.8.tar.gz
++>>>>>>> master
diff --cc sources
index 774c9c1,9400ed0..48e561c
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +502372506fd5ee86660eff735a9f681c  darktable-0.7.1.tar.gz
++=======
+ 1724601b0d7012a414f5398e5029cb45  darktable-0.8.tar.gz
++>>>>>>> master