Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 16:24:41 +0000 (18:24 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 16:24:41 +0000 (18:24 +0200)
commitcc65bff7c1d89d569a0476f8d67cbe687fc5a9fc
tree3de1d24c9ee4038dd3d518f181d8e25a32d61bbd
parentadee56222b82dddd175370102d33cd30cf2330f4
parent3daf1ecc212e4bd46f599c07ecfb5356f731986d
Merge branch 'master' into 0.11

Conflicts:
configure.ac
docs/plugins/inspect/plugin-esdsink.xml
docs/plugins/inspect/plugin-gconfelements.xml
gst/rtpmanager/rtpsession.c