Wim Taymans cf1248e566 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
2011-05-16 17:52:11 +02:00
..
2010-03-18 21:34:24 +00:00
2011-04-19 17:07:18 +02:00
2011-04-19 17:07:18 +02:00
2011-05-16 17:50:15 +02:00
2010-12-29 17:02:40 +01:00