From 16d9199bf58f6919011b82293ea090777eb85fb7 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