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
..
2011-04-18 10:23:45 +02:00
2011-06-18 13:36:06 +01:00
2011-05-24 17:34:19 +02:00
2011-06-02 18:51:29 +02:00