From 45a73393a6795582da5be5994a803fd9fdfb7cd8 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 1 Sep 2011 16:47:37 +0000
Subject: [PATCH] Uniformize code