Wim Taymans cc65bff7c1 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
	docs/plugins/inspect/plugin-esdsink.xml
	docs/plugins/inspect/plugin-gconfelements.xml
2011-06-21 18:24:41 +02:00
..
2007-06-12 18:52:33 +00:00
2011-04-30 18:16:36 +01:00
2007-06-12 18:52:33 +00:00