[kcm-gtk/f13/master: 4/4] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 4f587019bf8c135bd962373697af62d7454191d4
Merge: 4975b88 dd31439
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 28 08:36:02 2010 -0500

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	kcm-gtk.spec

 kcm-gtk.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---