Wim Taymans adaf08f143 Merge branch 'master' into 0.11-fdo
Conflicts:
	gst-libs/gst/tag/gstxmptag.c
2011-03-30 20:23:54 +02:00
..
2011-01-24 00:00:27 +00:00
2011-03-28 19:23:38 +02:00
2011-03-28 19:23:38 +02:00
2011-03-28 19:23:38 +02:00
2011-01-07 12:50:07 +00:00
2010-10-16 01:08:38 +01:00
2011-01-07 12:50:07 +00:00