Merged revisions 118962 via svnmerge from

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

................
r118962 | russell | 2008-05-29 12:52:00 -0500 (Thu, 29 May 2008) | 11 lines

Merged revisions 118961 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118961 | russell | 2008-05-29 12:51:29 -0500 (Thu, 29 May 2008) | 3 lines

 - Mark app_milliwatt dependent on res_indications (thanks to jsmith)
 - fix a typo in a log message (thanks to qwell)

........

................


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

apps/app_milliwatt.c

@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<depend>res_indications</depend>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -142,7 +146,7 @@ static int milliwatt_exec(struct ast_channel *chan, void *data)
 	}
 
 	if (!(wait_app = pbx_findapp("Wait"))) {
-		ast_log(LOG_ERROR, "The Playtones application is required to run Milliwatt()\n");
+		ast_log(LOG_ERROR, "The Wait application is required to run Milliwatt()\n");
 		return -1;
 	}