Merged from gnome-2.10
1 file changed