From 17ba65a10fae260955d1d820ed35648f6fc8ccda 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