From 7367a43547ca5a2d4d77ed9d34c64d40b9e09467 Mon Sep 17 00:00:00 2001
From: Steve Murphy <murf@digium.com>
Date: Tue, 15 Aug 2006 22:37:33 +0000
Subject: [PATCH] block the indicated 1.2 branch from being merged into trunk;
 it's already here.

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