From efbe736597bfaea5616c7fbc6298b2484179f617 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