Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Dec 2010 10:43:13 +0000 (11:43 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Dec 2010 10:43:13 +0000 (11:43 +0100)
commitfc12ade012a19f321de4a643c4068e9faca7cf39
tree01202115e8940d684031051db1424f2650a3aacd
parent422fea478c87430f5a1733ba93d3e7d4960a6771
parentca76a73ca0a25c87bca4ee339150ea4bf414d7aa
Merge branch 'master' into 0.11

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