From 2e08231d1c4952721cc79679b5b748e5a3e30d49 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