From b6791c52d18c214a5734f9e8a30b0f55f714b317 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 17 Jul 2011 20:02:10 +0000
Subject: [PATCH] Uniformize code