commit 56a0fdefe105901c8ac114ab7a275b42d8d2f008 Merge: 4c02c6e cf967d1 Author: pingou <pingou at pingoured.fr> Date: Thu Aug 5 11:24:38 2010 +0200 Merge branch 'master' into f14 .gitignore | 1 + guake.spec | 13 +++++-------- sources | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) ---