[gnome-settings-daemon/f19: 3/3] Merge branch 'master' into f19

[Jens Petersen]

commit 9be49afa7b3e03455b28de293062505e78504144
Merge: dbd0b5b 965ef3c
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu May 9 16:24:31 2013 +0900

    Merge branch 'master' into f19
    
    Conflicts:
    	gnome-settings-daemon.spec

 gnome-settings-daemon-ibus-kkc-libpinyin.patch |   20 ++++++++++++++++++++
 gnome-settings-daemon.spec                     |    9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---