From 821b53fbc4ece7c18edc7bbb45a0c1b3ce33f2d5 Mon Sep 17 00:00:00 2001
From: Jean-Tiare Le Bigot <jtlebi@gmail.com>
Date: Thu, 8 Dec 2011 16:38:35 +0100
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'