From 6725b44af74ed50a0fe22a60e6b3fefbbeb59cb0 Mon Sep 17 00:00:00 2001
From: Shaun Ruffell <sruffell@digium.com>
Date: Fri, 21 Jan 2011 05:23:14 +0000
Subject: [PATCH] Turning on merge tracking.

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9653 a0bf4364-ded3-4de4-8d8a-66a801d63aff