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