Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 26 Apr 2011 17:07:13 +0000 (19:07 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 26 Apr 2011 17:07:13 +0000 (19:07 +0200)
commit6959ebd8e8d6a6b2c05aa3b4da8becf1599264d3
tree809374aa69bf340ce42bc5cbb6fb81c15f283a2c
parentfc12ade012a19f321de4a643c4068e9faca7cf39
parentde30ca60c40faa48e52a5e4c514cf13b355f2c76
Merge branch 'master' into 0.11

Conflicts:
common
configure.ac
configure.ac
gst/rtsp-server/rtsp-media.c