[kde-plasma-runcommand/f13/master: 3/3] Merge branch 'master' into f13

[Jaroslav Reznik]

commit 8a3d11483d80e966c7ee7b7d86862fe2de85813e
Merge: e9533a1 66790ee
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Thu Aug 26 17:14:08 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

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