[gnome-settings-daemon: 22/22] Merge branch 'f15'

[Tomas Bzatek]

commit bf7437604a1dd10eea82499a16806f2e6b3dd177
Merge: e5e6754 630fe71
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Apr 22 14:03:16 2011 +0200

    Merge branch 'f15'
    
    Conflicts:
    	gnome-settings-daemon.spec

 .gitignore                                         |    6 +
 ...x-gsd_datetime_check_tz_name-never-workin.patch |   28 ----
 gnome-settings-daemon.spec                         |  148 +++++++++++++++++---
 slight-hinting.patch                               |   12 --
 sources                                            |    2 +-
 5 files changed, 136 insertions(+), 60 deletions(-)
---