Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 13 Oct 2011 06:53:34 +0000 (08:53 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 13 Oct 2011 06:53:34 +0000 (08:53 +0200)
1  2 
gst/videotestsrc/Makefile.am

Simple merge