Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:10:42 +0000 (12:10 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:10:42 +0000 (12:10 +0100)
1  2 
m4/gst-feature.m4

Simple merge