Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 07:48:44 +0000 (09:48 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 07:48:44 +0000 (09:48 +0200)
commit483c0fe4909c4e2f55681496652fb1f291fe3bd7
treec7b2c4ea95e1535ba3f0b8eb7bcd5b280b9b1100
parent32ea413a4088531b84b3b5dcaca6232163abb398
parent696a9a694f4f4dfe2f2fbf5929b96bb030a3af18
Merge branch 'master' into 0.11

Conflicts:
gst/gstpad.h
gst/gstclock.h