From 9089cf1a789229743ccca84a1e235c5f49d6daf4 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 2 Sep 2011 14:31:53 +0000
Subject: [PATCH] Uniformize code