From 2f618b9006cdb9789c03cfa7318b45c30b70e1f0 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sat, 18 Dec 2010 13:32:16 +0000
Subject: [PATCH] Close merging with rel520