Alexandre Julliard : Merge with fontforge 20120731-b.

[Alexandre Julliard]

Module: fontforge
Branch: master
Commit: 3580f3e488671a3b0df2487a3fe3eadd0a21f9be
URL:    http://source.winehq.org/git/fontforge.git/?a=commit;h=3580f3e488671a3b0df2487a3fe3eadd0a21f9be

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jul 11 15:48:11 2013 +0200

Merge with fontforge 20120731-b.

Conflicts:
	fontforge/bitmapview.c

---