Merge remote-tracking branch 'origin/0.10'

Conflicts:
	libs/gst/base/gstbaseparse.c
This commit is contained in:
Sebastian Dröge 2012-04-02 15:30:04 +02:00
commit 3601e80e83

Diff content is not available