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