[kdeutils/f14/master: 9/9] Merge remote-tracking branch 'origin/master' into f14

[Jaroslav Reznik]

commit 29cb7372bb9cca292f16d39b2a9bd031b0f977ab
Merge: 33858a8 52889d3
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Wed Mar 16 15:55:52 2011 +0100

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	kdeutils.spec
    	sources

 .gitignore    |    2 +-
 kdeutils.spec |   72 ++++++++++++++++++++++++++++----------------------------
 sources       |    2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)
---