Patch by Vincent Untz <vuntz@gnome.org>. Closes #566611. svn path=/branches/gnome-2-24/; revision=2788