=== 2.12.1 ===
2005-10-03  Gustavo J. A. M. Carneiro  <gjc@gnome.org>

	* gnomevfs/vfs-async-handle.c: #define NO_IMPORT_PYGOBJECT, bug
	#315382.  Patch by dmacks@netspace.org.

	* bonobo/pybonobo.c: #define NO_IMPORT_PYORBIT, more related to
	bug #315382.  Patch by dmacks@netspace.org.

	* configure.in: Bump version to 2.12.1.

2005-09-14  Gustavo J. A. M. Carneiro  <gjc@gnome.org>

	* gnome/ui.override: #define NO_IMPORT_PYGNOMEVFS, to complement
	fix of bug #315382.

2005-09-13  Gustavo J. A. M. Carneiro  <gjc@gnome.org>

	* gconf/gconf-types.c: #define NO_IMPORT_PYGOBJECT before
	including pygobject.h.  Fixes bug 315382: "Cannot compile:
	__PyGnomeVFS_API problem".  Patch by dmacks@netspace.org.

2005-09-15  Raphael Slinckx  <rslinckx@cvs.gnome.org>

	* gnome/ui.override:
	Remove a very useful g_message("foo")