Merge branch 'master' into 0.11

diff --combined gst/videotestsrc/Makefile.am
index cbfda81,91b6f63..8f52be3
--- 1/gst/videotestsrc/Makefile.am
--- 2/gst/videotestsrc/Makefile.am
+++ b/gst/videotestsrc/Makefile.am
@@@ -8,11 -8,9 +8,11 @@@ libgstvideotestsrc_la_SOURCES = 
                        videotestsrc.c
  nodist_libgstvideotestsrc_la_SOURCES = $(ORC_NODIST_SOURCES)
  
 -libgstvideotestsrc_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 +libgstvideotestsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
  libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 -libgstvideotestsrc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
 +libgstvideotestsrc_la_LIBADD =        \
 +      $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
 +      $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
  libgstvideotestsrc_la_LIBTOOLFLAGS = --tag=disable-static
  
  noinst_HEADERS = gstvideotestsrc.h videotestsrc.h
@@@ -21,7 -19,7 +21,7 @@@ noinst_PROGRAMS = generate_sine_tabl
  
  generate_sine_table_SOURCES = generate_sine_table.c
  generate_sine_table_CFLAGS = $(GST_CFLAGS)
- generate_sine_table_LDADD = $(LIBM)
+ generate_sine_table_LDADD = $(LIBM) $(GLIB_LIBS)
  
  Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \