From f88f6c18a35eef4a4ee9bb48e35f5f5b92fae6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Sun, 27 Nov 2011 23:33:45 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into 0.11