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

[hannes]

commit e177f24cd678d9bed2f3f1436c8903d6c2b31514
Merge: a49d130 fe5673e
Author: johannes lips <johannes at fedorabox.localdomain>
Date:   Wed Jan 12 17:04:58 2011 +0100

    Merge branch 'master' into f13

 .gitignore    |    1 +
 freemind.spec |    7 +++++--
 sources       |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---