From: Alexandre Goujon <ale.goujon@gmail.com>
Subject: 
Message-Id: <1279446530-2311-1-git-send-email-ale.goujon@gmail.com>
Date: Sun, 18 Jul 2010 11:48:49 +0200

This should fix bug #22836.
Changes are quite important but I added several tests to ensure I'm doing it right