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