Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 17:29:20 +0000 (17:29 +0000)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 17:29:20 +0000 (17:29 +0000)
commitbbf9cd7f13821f6b0b4540723db90fbdea0630d3
tree21f9c4fb0f325a9066a9774f6b1d9698f303b840
parentd0e2f7f2dc36457459cf029639d82767707cb6cb
parentacb66eb7f4f686b9402a7b031d3f551d3801fc6e
Merge branch 'master' into 0.11
configure.ac