From 6b2fae61bf47a1909c810a42bf92c568394bac9a 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