[bluefish/f13/master: 7/7] Merge branch 'master' into f13

[Paul Howarth]

commit 9dede8ca92c32443c61cf9b37aaf87069c48fcd4
Merge: 62432f9 7c08402
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Aug 26 10:42:10 2010 +0100

    Merge branch 'master' into f13

 Fedora_bug_626246.patch |   22 ++++++++++++++++++++++
 bluefish.spec           |   14 ++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
---