From 68869cf828305f9a0e0d0f32413f3fd3b62aae24 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Fri, 17 Oct 2008 21:39:49 +0000
Subject: [PATCH] Blocked revisions 150729 via svnmerge

........
  r150729 | qwell | 2008-10-17 16:35:23 -0500 (Fri, 17 Oct 2008) | 1 line

  Merge codec_consistency branch.  This should make sample usage much happier.
........


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