[kde-plasma-runcommand/f12/master: 4/4] Merge branch 'master' into f12

[Jaroslav Reznik]

commit 346d5e04dd7c61bcca306277c16dbe5286792e42
Merge: 243ae8b 66790ee
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Thu Aug 26 17:16:56 2010 +0200

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

 kde-plasma-runcommand.spec |    5 ++++-
 sources                    |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---