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