2008-05-07  Kjartan Maraas  <kmaraas@gnome.org>

	* gconf/gconf-internals.c: (gconf_log):
	* gconf/gconf-sources.c: (gconf_sources_new_from_addresses):
	* gconf/gconfd.c: (main): Merge the desyslogification patch
	from Debian. Also used in Fedora now. Closes bug #126468.

svn path=/trunk/; revision=2584