From 86666e4215c59da0c3ca01337cf243a6befc539c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 17 Jul 2011 20:02:10 +0000
Subject: [PATCH] Uniformize code