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