Tomas Frydrych 9821453b5f Merge branch 'upstream-2.25.55' into next-generation
Conflicts:

	configure.in
	src/Makefile.am
	src/core/screen-bindings.h
	src/metacity.schemas.in
2008-12-18 11:00:19 +00:00
..
2008-04-29 02:54:56 +00:00
2008-04-29 02:54:56 +00:00