2010-07-09  Miguel de Icaza  <miguel@novell.com>

	* Sync to the latest version.

