tree bf74474a260fee7da60fa594e8b6a9e69803b0a2
parent 2f9a7b1a1b531a81f4e3d6829130d10e92598bcf
parent bddac509612362a53a4636dfb53cc9e097f7bf53
author Wim Taymans <wim.taymans@collabora.co.uk> 1303724308 +0200
committer Wim Taymans <wim.taymans@collabora.co.uk> 1303724308 +0200

Merge branch 'master' into 0.11