From c1c6fc5e789ee29e196083712698b55aeb6492ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 14 Sep 2011 22:51:11 +0000
Subject: [PATCH] Uniformize code