Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Mar 2011 15:30:36 +0000 (16:30 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Mar 2011 15:30:36 +0000 (16:30 +0100)
commit338c300f5fdd7ec1b62c4c46b5c871f4af9001db
treefda790ea726252ac1de0c0e22d4663a436f80057
parentdb5aa9067b866ec0c4e4fecbb3fecb9ae94f58ad
parent89914439b79309f1adc5b9272c84682181b5c895
Merge branch 'master' into 0.11
configure.ac