[musca/f17: 2/2] Merge branch 'master' into f17

[Damien Durand]

commit f5fb96d8657d101bf0077c8f305fb821cce78791
Merge: eeb2747 c5c26f6
Author: damien <damien at rhel.localdomain>
Date:   Wed Apr 25 16:20:12 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	musca.spec

 dmenu_run.patch |   11 +++++++++++
 musca.spec      |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --cc musca.spec
index 07808b6,e7a6831..1a8629e
--- a/musca.spec
+++ b/musca.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           musca
  Version:        0.9.24
--Release:        3%{?dist}
++Release:        4%{?dist}
  Summary:        A simple dynamic window manager fox X
  
  Group:          User Interface/Desktops
@@@ -59,9 -61,9 +61,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Mon Feb 20 2012 Damien Durand <splinux25 at gmail.com> - 0.9.24-3
++* Mon Apr 25 2012 Damien Durand <splinux25 at gmail.com> - 0.9.24-4
 +- Release bumped for F17.
 +
+ * Wed Apr 25 2012 Damien Durand <splinux25 at gmail.com> - 0.9.24-3
+ - dmenu_run in config file instead of dmenu.
+ 
  * Sun Feb 19 2012 Damien Durand <splinux25 at gmail.com> - 0.9.24-2
  - Add a proper description.
  - We preserve timestamp with the install command.