Conflicts: configure.ac docs/plugins/inspect/plugin-esdsink.xml docs/plugins/inspect/plugin-gconfelements.xml