From 1960404f9c19a1f31d511424afd6598f3cf90faa Mon Sep 17 00:00:00 2001
From: Alexis Bory <alexis.bory@gmail.com>
Date: Wed, 2 Nov 2011 20:45:42 +0100
Subject: [PATCH] Merge branch 'work'