Wim Taymans 0ac9bb7d99 Merge branch 'master' into 0.11
Conflicts:
	tests/examples/audio/Makefile.am
	tests/examples/v4l/Makefile.am
2011-06-10 12:14:57 +02:00
..
2011-05-24 00:13:04 +03:00
2011-06-07 20:47:46 +01:00
2005-11-30 17:45:21 +00:00
2005-08-05 17:13:10 +00:00