From de91ed89cfea575509ffd6816c4147e778465c2e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 18 Oct 2011 14:32:05 +0200
Subject: [PATCH] Merge branch 'master' into 0.11