From 563b5703f20d92c69b4fbb2da515b77f5f9c44d2 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