[bluefish: 21/23] Merge branch 'master' into f14

[Paul Howarth]

commit 10f6f3286abaed20ac21a80c1028ca8a529ec7a5
Merge: 64140e4 29f1c7b
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Dec 15 17:58:36 2010 +0000

    Merge branch 'master' into f14

 bluefish.spec           |   10 +++++++++-
 fedora_bug_663014.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletions(-)
---