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