From 531fbcf1eeb62ea099e30a405ffee8fe73d264c3 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Mon, 23 Apr 2012 15:42:13 +0100
Subject: [PATCH] Fixing further issue with conflict resolution