[bluefish/f14/master: 6/6] Merge remote branch 'origin/master' into f14/master

[Paul Howarth]

commit 64140e4afa9e0e48edd9a3c428155f19902edd51
Merge: 480d528 1782eff
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Nov 18 16:36:28 2010 +0000

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

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