From 31dc6ddf43b5a91b2ffb0131cc6572d79e4f2947 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 11 Dec 2009 23:30:00 +0000
Subject: [PATCH] forgot the merge props for 234426

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