Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 10:58:42 +0000 (11:58 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 10:58:42 +0000 (11:58 +0100)
commit05c3928b11a9bfe27851b1ac21c8a088fc12a122
tree1bb4b1c66f9623d39adef7fc822182e050563efe
parent7c147e48ea4f7d66bd732faa32418c48e9a6d8c6
parent20b6be38527123836c656570b1d503fc7967ca39
Merge branch 'master' into 0.11