From 6b8abce03ae198d4f89cf0f47ff31a14bd008328 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Tue, 6 Dec 2011 13:52:44 +0000
Subject: [PATCH] - commited merge information (done earlier) -

SVN:1.2[1705]