From 9c4ebba68aed2c8207300101f90fea5028226662 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 23 Sep 2008 23:34:57 +0000
Subject: [PATCH] Blocked revisions 144149 via svnmerge

........
r144149 | mmichelson | 2008-09-23 18:33:33 -0500 (Tue, 23 Sep 2008) | 3 lines

Fix a conflict in flag values


........


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