[guake/f12/master: 21/21] Release 0.4.2 merged

[Pierre-YvesChibon]

commit 4d87d605fd4875361e826c6cc81112819b778215
Merge: 247f7b6 e36ab1c
Author: pingou <pingou at pingoured.fr>
Date:   Thu Aug 5 11:31:25 2010 +0200

    Release 0.4.2 merged

 guake.spec |   45 +++++++++++++++++++--------------------------
 sources    |    4 ++++
 2 files changed, 23 insertions(+), 26 deletions(-)
---
diff --cc sources
index 88e4994,acdef24..7fc8ac6
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +c3bd763f0a7c91cb453c32d8045fa6ca  guake-0.4.1.tar.gz
++=======
+ 1f0feff3bfc15c998147dbf07d9d8a8e  guake-0.4.2.tar.gz
++>>>>>>> f13