Merge from vendor branch TNF:
authordrochner <drochner>
Fri, 11 Apr 2008 19:12:09 +0000 (19:12 +0000)
committerdrochner <drochner>
Fri, 11 Apr 2008 19:12:09 +0000 (19:12 +0000)
commit1162ab14ce72375a4ba588530dcf91bcf8dc5ca6
treeff0569aedda1921734154980bb174b29c5d9fb29
parent51873cfbaa4607a2df51c58c3af7f3821b60f0d4
parente5282d2613c3af70e5e28aff092230644604e7ab
Merge from vendor branch TNF:
add gnome-settings-daemon-2.22.1, a program to manage preferences etc,
used to be part of gnome-control-center but was split out in gnome-2.22