Wim Taymans 4bb2b140e9 Merge branch 'master' into 0.11
Conflicts:
	sys/v4l2/v4l2src_calls.c
2011-08-16 18:35:53 +02:00
..
2011-08-16 18:35:53 +02:00
2011-02-28 11:58:48 +01:00
2011-07-10 14:56:00 +02:00
2011-02-28 11:58:49 +01:00