From 3940da78a4d433e6bcf0d8e3791005c7583ac282 Mon Sep 17 00:00:00 2001
From: Shaun Ruffell <sruffell@digium.com>
Date: Mon, 31 Jan 2011 18:09:40 +0000
Subject: [PATCH] syncing svnmerge-integrated.

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