Merge branch 'master' into 0.11
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Thu, 22 Mar 2012 17:23:22 +0000 (18:23 +0100)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Thu, 22 Mar 2012 17:23:22 +0000 (18:23 +0100)
commit8f9828393e96933633e392b1b79ca471d0974fa3
treec44ecb4565ef203f5d6a49c83d85d81b234f8a05
parentbcf5f38b1668534c57d5b4f0fdc27405e15ae427
parent2de5d0d52f06f271d752b8656e32b16289b426fb
Merge branch 'master' into 0.11