From ff79e2c8aeb692126bfda80c9776359dc9a15ddf Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 3 Feb 2012 09:59:06 +0000
Subject: [PATCH] Add merge from tags/rel600