Index: apps/app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.125
diff -u -r1.125 app_meetme.c
--- apps/app_meetme.c	8 Nov 2005 23:19:30 -0000	1.125
+++ apps/app_meetme.c	9 Nov 2005 16:16:29 -0000
@@ -848,7 +848,7 @@
 
 	time(&user->jointime);
 
-	if (conf->locked) {
+	if (conf->locked && (!(confflags & CONFFLAG_ADMIN))) {
 		/* Sorry, but this confernce is locked! */	
 		if (!ast_streamfile(chan, "conf-locked", chan->language))
 			ast_waitstream(chan, "");