[merkaartor/f13/master: 17/17] Merge branch 'master' into f13

[Sven Lankes]

commit 494bff0a336634295556aa89d467667dedff3cf6
Merge: 6cef785 13551be
Author: Sven Lankes <sven at lank.es>
Date:   Sun Aug 15 23:17:17 2010 +0200

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

 .gitignore      |    2 +-
 merkaartor.spec |   13 +++++++++++--
 sources         |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 314d161,c1f48bf..745f4e0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- merkaartor-0.15.3.tar.bz2
 -merkaartor-0.16.1.tar.bz2
 -/merkaartor-0.16.2.tar.bz2
++merkaartor-0.16.2.tar.bz2