From 1e68f2d312b70cfd4fe663509d91c55a6d62bb0f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 26 Sep 2011 22:31:17 +0200
Subject: [PATCH] Merge branch 'master' into 0.11