From c46809198a99feadbfd15c742c25bce2f7ae9ccf Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 25 Jul 2011 20:16:00 +0000
Subject: [PATCH] Manually restore merge info that got lost in a previous
 commit