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

[Jaroslav Reznik]

commit 44991fb7357a469db7460ab4e24085910640a699
Merge: 2a3f516 fb26b14
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue Mar 15 19:15:35 2011 +0100

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

 .gitignore                                         |    2 +-
 ...rinting.patch => kdeadmin-4.5.80-printing.patch |   42 ++++++++++----------
 kdeadmin.spec                                      |   38 +++++++++++-------
 sources                                            |    2 +-
 4 files changed, 46 insertions(+), 38 deletions(-)
---