Wim Taymans f372ec1f54 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
	docs/plugins/inspect/plugin-gnomevfs.xml
2011-06-21 17:57:56 +02:00
..
2011-06-21 17:57:56 +02:00
2011-06-15 18:01:04 +02:00