[qlandkartegt/f13/master: 2/2] Merge branch 'master' into f13

[Dan Horák]

commit 7e6a68fb0f54bbeff380e6670bffbcc21aad118f
Merge: 894f2bf 0720e16
Author: Dan Horák <dan at danny.cz>
Date:   Sat Jan 1 10:51:39 2011 +0100

    Merge branch 'master' into f13

 qlandkartegt.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---