From b58ed02a95a7c19e8677005f92519ba96f72441d Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 2 Sep 2011 12:51:12 +0000
Subject: [PATCH] Uniformize code