From 0f711f2946ebe206f28668223ecbc9533bb4f27e 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