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

[Paul Howarth]

commit 1b90ce805e60a9ac080b10e0a0cf8a0b1cb87719
Merge: 1b36fff 1782eff
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Nov 18 16:39:28 2010 +0000

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

 bluefish.spec           |   18 ++++++-
 fedora_bug_653299.patch |  134 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 151 insertions(+), 1 deletions(-)
---