From 72f951f6d7931c461f72dca69d90eb2b80b635da Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Thu, 5 Apr 2012 17:15:11 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/0.10'