From 2f8001fc3b5e1a198601f65e84c7ddadee8341cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Teuli=C3=A8re?= <ipkiss@gmail.com>
Date: Wed, 14 Oct 2009 19:47:07 +0000
Subject: [PATCH] Backport of the latest fixes to the 1.10 branch