From 57ec6e7599c9fd74b4411b0a4ed744683760520f Mon Sep 17 00:00:00 2001
From: Alexis Bory <alexis.bory@gmail.com>
Date: Sat, 21 Jul 2012 18:02:57 +0200
Subject: [PATCH] Merge branch 'work'