From 6d964b40e205cb1da30820c0c60b67a198a79691 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