[goldendict/f13/master: 15/15] Merge branch 'master' into f13

[helloworld1]

commit 8993713339feb8a20437a1ca02c5d0d24bd1f43f
Merge: 29acf6a 9e4cae9
Author: Liberty <mrlhwliberty at gmail.com>
Date:   Wed Aug 4 09:13:41 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	goldendict.spec
    	sources

 .gitignore      |    5 +++++
 goldendict.spec |   14 ++++++++++----
 sources         |    1 +
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 276ffa3,20968e8..e1e7534
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,6 @@@
  goldendict-c33fa2c.tar.gz
++<<<<<<< HEAD
++=======
+ goldendict-4fa567e.tar.gz
+ goldendict-415f35e.tar.gz
++>>>>>>> master
diff --cc sources
index 6be517b,ebfca07..4ec56cf
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
 +baa66278f6eeda5eea966bda7d5ec58d  goldendict-c33fa2c.tar.gz
+ 97bd28e39279ff55d4244356d43a10e4  goldendict-415f35e.tar.gz