From 93688c0794d93e7ec3801a0d7623d13ee0eb6317 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 18 Jul 2011 18:09:04 +0000
Subject: [PATCH] Uniformize code