From 139cb43b14a4779b165fed915364f36aa80c21d8 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Sat, 8 Oct 2011 11:17:11 +0200
Subject: [PATCH] Merge branch 'master' into 0.11