From b862065c044d15dc0f69e907a812b165f720d0e0 Mon Sep 17 00:00:00 2001
From: Olivier Ligot <oligot@gmail.com>
Date: Mon, 26 Mar 2012 17:19:02 +0200
Subject: [PATCH] Merge branch 'master', remote branch 'upstream/master'