Wim Taymans 586ef0babd Merge branch 'master' into 0.11
Conflicts:
	ext/speex/gstspeexdec.c
	ext/speex/gstspeexenc.c
	gst/isomp4/atoms.c
	gst/isomp4/gstqtmux.c
2011-10-06 12:23:39 +02:00
..
2011-10-06 12:23:39 +02:00
2011-09-29 17:33:25 +02:00
2011-10-06 12:23:39 +02:00
2011-09-29 17:33:21 +02:00