From 925e62413cca5f77f5efca8276bf5f8332daff37 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 1 Sep 2011 16:47:37 +0000
Subject: [PATCH] Uniformize code