From 1888162a02cfa2248ac0135c79843807a686da30 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 2 Sep 2011 13:31:44 +0000
Subject: [PATCH] Uniformize code