[guake/el6: 3/3] Merge branch 'master' into el6

[Pierre-YvesChibon]

commit 3c24d305cf15bc005580978b59f392404541537e
Merge: 7452444 ff87381
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Aug 2 16:03:49 2012 +0200

    Merge branch 'master' into el6

 0001-Let-allow-the-signal.SIGTERM-to-fail.patch |    2 +-
 guake.spec                                      |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---