[bluefish/el6/master: 13/13] Merge branch 'master' into el6

[Paul Howarth]

commit adfefff6f6b3a991f80803274b5bbf64dcc4c2c8
Merge: 5a6cf9a 7c08402
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Aug 26 10:43:27 2010 +0100

    Merge branch 'master' into el6

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