From 9a7ad4ae56dd14d80d77104ba251438360fe8ed2 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