From 73a61dc2a84f92c3962fdb8dc1d2989f035fd024 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