From 5e8fd1b875a5740a22c110a2172bdabf1987403d Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 7 Nov 2011 10:02:00 +0100
Subject: [PATCH] Merge branch 'master' into 0.11