Index: linphone/console/linphonec.c
===================================================================
--- linphone/console/linphonec.c	(revision 236)
+++ linphone/console/linphonec.c	(revision 237)
@@ -369,4 +369,5 @@
 	ortp_socket_t server_sock;
 	char service[12];
+	int tmp,err;
 	/*setup the server socket */
 	struct addrinfo *ai=NULL;
@@ -382,4 +383,7 @@
 	}
 	server_sock=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+	tmp=1;
+	err=setsockopt(server_sock,SOL_SOCKET,SO_REUSEADDR,(void*)&tmp,sizeof(tmp));
+	if (err<0) fprintf(stderr,"Error in setsockopt(): %s\n",getSocketError());
 	if (bind(server_sock,ai->ai_addr,ai->ai_addrlen)!=0){
 		fprintf(stderr,"Failed to bind command socket.");
Index: linphone/mediastreamer2/tests/mediastream.c
===================================================================
--- linphone/mediastreamer2/tests/mediastream.c	(revision 117)
+++ linphone/mediastreamer2/tests/mediastream.c	(revision 237)
@@ -122,5 +122,6 @@
 								"[ --jitter <miliseconds>]\n"
 								"[ --width <pixels>]\n"
-								"[ --height <pixels> ]\n";
+								"[ --height <pixels> ]\n"
+								"[ --bitrate <bits per seconds>]\n";
 static void run_media_streams(int localport, const char *remote_ip, int remoteport, int payload, const char *fmtp, int jitter, bool_t ec, int bitrate, MSVideoSize vs);