From 72be167545f838eba2411736bcab39ac9b17f0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20T=C3=B6rnblom?= <john.tornblom@gmail.com>
Date: Thu, 8 Mar 2012 10:54:48 +0100
Subject: [PATCH] Merge branch 'upstream', remote branch 'upstream/master' into
 upstream