From 2279eb934ef0820a37dcf6cdfbcad4d9e64b1db0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 14 Sep 2011 23:01:07 +0000
Subject: [PATCH] Uniformize code