From e1e5cda8dcd96b22d14e4b0d2138a8875043b429 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Sun, 16 Oct 2011 15:28:31 +0200
Subject: [PATCH] Merge branch 'master' into 0.11