Wim Taymans cf1248e566 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
2011-05-16 17:52:11 +02:00
..
2011-04-30 17:58:02 +01:00
2011-04-30 17:58:02 +01:00
2011-04-30 17:58:02 +01:00
2011-04-30 17:58:02 +01:00
2011-04-30 17:58:02 +01:00
2011-04-30 17:58:02 +01:00
2011-04-30 17:58:02 +01:00
2011-05-16 17:52:11 +02:00
2011-04-30 17:58:02 +01:00