[fgrun/f17: 4/4] Merge branch 'master' into f17

[Fabrice Bellet]

commit e817e6796eee023a79fcabe91e41f8a755d3a8be
Merge: 6031a02 ad5b2db
Author: Fabrice Bellet <fabrice at bellet.info>
Date:   Mon Jul 30 22:29:30 2012 +0200

    Merge branch 'master' into f17

 fgrun-1.6.1-default-settings-for-fedora.patch |   16 --
 fgrun-1.6.1-systemprefs.patch                 |  209 +++++++++++++++++++++++++
 fgrun.prefs                                   |   10 ++
 fgrun.spec                                    |   87 ++++++-----
 4 files changed, 269 insertions(+), 53 deletions(-)
---