Merged revisions 220629 via svnmerge from

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

........
  r220629 | mvanbaak | 2009-09-27 22:40:16 +0200 (Sun, 27 Sep 2009) | 3 lines
  
  add name argument for the CALLERID dialplan function to the xml documentation.
  Pointed out to me on IRC by snuff-home. Thanks
........


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

funcs/func_callerid.c

@@ -17,7 +17,7 @@
 /*! \file
  *
  * \brief Caller ID related dialplan functions
- * 
+ *
  * \ingroup functions
  */
 
@@ -43,6 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 				<enumlist>
 					<enum name="all" />
 					<enum name="num" />
+					<enum name="name" />
 					<enum name="ANI" />
 					<enum name="DNID" />
 					<enum name="RDNIS" />