[ffgtk/f15: 2/2] Merge branch 'master' into f14

[Louis Lagendijk]

commit 4c3eab5bf5ef68e4c4e6e7f6a20fd3887d7b0b65
Merge: 806fae8 57b6d1f
Author: Louis Lagendijk <louis at lagendijk.xs4all.nl>
Date:   Tue Jul 5 15:22:40 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	ffgtk-use-old-spooler.patch
    	ffgtk.spec
    	sources

 .gitignore                  |    2 +-
 ffgtk-libexec.patch         |   64 -----------------
 ffgtk-license.txt           |  115 ------------------------------
 ffgtk-no-Werror.patch       |  162 -------------------------------------------
 ffgtk-use-old-spooler.patch |   36 ++--------
 ffgtk.spec                  |   74 +++++++++++--------
 sources                     |    2 +-
 7 files changed, 51 insertions(+), 404 deletions(-)
---