From dfaec6eccd91f0981d7c9f4e20824d91bb40c175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 4 Apr 2012 12:06:08 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/0.10'