From 523900c1019ea51903aa630e5d3e993b27e9d6b2 Mon Sep 17 00:00:00 2001
From: Olle Johansson <oej@edvina.net>
Date: Mon, 7 May 2007 14:19:32 +0000
Subject: [PATCH] Guess svnmerge doesn't handle files that move around.
 Blocking patch to ./config.c

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@63196 65c4cc65-6c06-0410-ace0-fbb531ad65f3