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

[Paul Howarth]

commit 17058e8e2d84423edb3f9a37975460e1418c9633
Merge: adfefff bd0ae2e
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Sep 17 14:28:46 2010 +0100

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

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