From 1b9f29e7ff2533b459b4acc52f7f2789d2dd9147 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 14 Sep 2011 22:51:11 +0000
Subject: [PATCH] Uniformize code