From 573ced58528dd6260276b4fe777c2c5e81aba175 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