[bluefish/f13/master: 3/3] Merge remote branch 'origin/master' into f13/master

[Paul Howarth]

commit 1b36fffaa59e5d2b8ec5cc3f570b49d7b0fd0dfb
Merge: 9dede8c bd0ae2e
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Sep 17 14:47:27 2010 +0100

    Merge remote branch 'origin/master' into f13/master

 .gitignore              |    2 +-
 Fedora_bug_626246.patch |   22 ----------------------
 bluefish.spec           |   23 +++++++++++++++--------
 sources                 |    2 +-
 4 files changed, 17 insertions(+), 32 deletions(-)
---