[fontforge: 2/2] Merge branch 'master' into f15. Updates to 20110222 and fixes bug #688470 (obsolete sources) and bug

[Paul Flo Williams]

commit aed5f362987ec4a50e98d058046777499e7bf371
Merge: 7430dad 963e5f1
Author: Paul Flo Williams <paul at frixxon.co.uk>
Date:   Thu Mar 31 17:41:05 2011 +0100

    Merge branch 'master' into f15.
    Updates to 20110222 and fixes bug #688470 (obsolete sources)
    and bug #660376 (charview crash)
    
    Conflicts:
    	fontforge.spec

 .gitignore        |    2 ++
 fontforge.desktop |   10 ----------
 fontforge.spec    |   33 ++++++++++++++-------------------
 fontforge.xml     |   11 -----------
 sources           |    4 ++--
 5 files changed, 18 insertions(+), 42 deletions(-)
---