From faf5fa6d4089157c288e5433d79949e6d8a4aa05 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 1 Sep 2011 07:32:26 +0000
Subject: [PATCH] Uniformize code