Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 23 Nov 2011 09:23:28 +0000 (10:23 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 23 Nov 2011 09:23:28 +0000 (10:23 +0100)
1  2 
tests/check/Makefile.am

Simple merge