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