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