From 15e5c673b5ce1c114e10fde42b1cf7f09add347c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 10 Nov 2011 12:14:19 +0100
Subject: [PATCH] Merge branch 'master' into 0.11