Merged revisions 148010 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r148010 | tilghman | 2008-10-09 15:00:46 -0500 (Thu, 09 Oct 2008) | 1 line
  
  Publish MOH files in sln16 format
........


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

sounds/Makefile

@@ -50,6 +50,7 @@ MM:=$(subst -ALAW,-alaw,$(MM))
 MM:=$(subst -GSM,-gsm,$(MM))
 MM:=$(subst -G729,-g729,$(MM))
 MM:=$(subst -G722,-g722,$(MM))
+MM:=$(subst -SLN16,-sln16,$(MM))
 MOH:=$(MM:MOH-%=asterisk-moh-%.tar.gz)
 MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
 # If "fetch" is used, --continue is not a valid option.

sounds/sounds.xml

@@ -57,6 +57,8 @@
 		</member>
 		<member name="MOH-FREEPLAY-G722" displayname="FreePlay Music On Hold Files, G.722 format" >
 		</member>
+		<member name="MOH-FREEPLAY-SLN16" displayname="FreePlay Music On Hold Files, Signed-linear 16kHz format" >
+		</member>
 	</category>
 	<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
 		<member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">