From 091ce831d88f34eddeabfaec40f0b0cb5f7adedb Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 1 Sep 2011 07:32:26 +0000
Subject: [PATCH] Uniformize code