From 44074cde71a75d6a0ac7533f43cccc7e1174f71a Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 2 Sep 2011 14:31:53 +0000
Subject: [PATCH] Uniformize code