From 815205b3242186d0fd038c088322da067ab669b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 14 Sep 2011 22:51:11 +0000
Subject: [PATCH] Uniformize code