From 4c53f89dcdf179a6fe9a4723eddbf7b8b6460f9c Mon Sep 17 00:00:00 2001
From: Shaun Ruffell <sruffell@digium.com>
Date: Fri, 21 Jan 2011 05:35:56 +0000
Subject: [PATCH] Updating the svnmerge-integrated information.

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