From fc326a4dce6f1629dccfd393ec32d0002ae9fc94 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