diff --git a/NEWS b/NEWS
index 0173bf7d2..cc43b585d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-linphone-3.3.0 -- ?????????
+linphone-3.3.0 -- May 10, 2010
 	* liblinphone is ported to iphoneOS and Google Android
 	* Internal refactoring of liblinphone (code factorisation, encapsulation
 		of signaling)
diff --git a/configure.in b/configure.in
index 2ecf17659..6e40e3105 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.2.99.7],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.3.0],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 
 dnl Source packaging numbers
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index ff155b6dd..67611e2e3 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -240,6 +240,9 @@ static void call_updated(SalOp *op){
 	if (call->resultdesc)
 		sal_media_description_unref(call->resultdesc);
 	call->resultdesc=sal_call_get_final_media_description(op);
+	if (call->resultdesc)
+		sal_media_description_ref(call->resultdesc);
+
 	if (call->resultdesc && !sal_media_description_empty(call->resultdesc))
 	{
 		if( (call->state == LinphoneCallPaused) && strcmp(call->resultdesc->addr,"0.0.0.0"))
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 060de0a0e..26ece225b 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -135,6 +135,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 		to_str=linphone_address_as_string(to);
 		from_str=linphone_address_as_string(from);
 		sal_op_set_route(call->ping_op,sal_op_get_network_origin(call->op));
+		sal_op_set_user_pointer(call->ping_op,call);
 		sal_ping(call->ping_op,to_str,from_str);
 		ms_free(to_str);
 		ms_free(from_str);
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index d21b81cf1..5b4779680 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -62,6 +62,7 @@ int lc_callback_obj_invoke(LCCallbackObj *obj, LinphoneCore *lc){
 	return 0;
 }
 
+		
 /*prevent a gcc bug with %c*/
 static size_t my_strftime(char *s, size_t max, const char  *fmt,  const struct tm *tm){
 #if !defined(_WIN32_WCE)
diff --git a/gtk-glade/main.c b/gtk-glade/main.c
index 719ae5987..87db8fb2a 100644
--- a/gtk-glade/main.c
+++ b/gtk-glade/main.c
@@ -1235,9 +1235,11 @@ int main(int argc, char *argv[]){
 	const char *factory_config_file;
 	const char *lang;
 	GtkSettings *settings;
+	GdkPixbuf *pbuf;
 
 	g_thread_init(NULL);
 	gdk_threads_init();
+	
 	progpath = strdup(argv[0]);
 	
 	config_file=linphone_gtk_get_config_file();
@@ -1251,6 +1253,9 @@ int main(int argc, char *argv[]){
 			_putenv(tmp);
 		}
 	}
+#else
+	/*for pulseaudio:*/
+	g_setenv("PULSE_PROP_media.role", "phone", TRUE);
 #endif
 
 	if ((lang=linphone_gtk_get_lang(config_file))!=NULL && lang[0]!='\0'){
@@ -1281,6 +1286,7 @@ int main(int argc, char *argv[]){
 		gdk_threads_leave();
 		return -1;
 	}
+	
 	settings=gtk_settings_get_default();
 	g_object_set(settings, "gtk-menu-images", TRUE, NULL);
 	g_object_set(settings, "gtk-button-images", TRUE, NULL);
@@ -1305,6 +1311,11 @@ int main(int argc, char *argv[]){
 	add_pixmap_directory("pixmaps");
 	add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/linphone");
 
+	
+	g_set_application_name("Linphone");
+	pbuf=create_pixbuf(linphone_gtk_get_ui_config("icon",LINPHONE_ICON));
+	if (pbuf!=NULL) gtk_window_set_default_icon(pbuf);
+	
 	the_ui=linphone_gtk_create_window("main");
 	
 	linphone_gtk_create_log_window();
diff --git a/java/j2me/org/linphone/core/LinphoneCoreException.java b/java/j2me/org/linphone/core/LinphoneCoreException.java
index 10900a633..105224ee4 100644
--- a/java/j2me/org/linphone/core/LinphoneCoreException.java
+++ b/java/j2me/org/linphone/core/LinphoneCoreException.java
@@ -34,7 +34,7 @@ public class LinphoneCoreException extends Exception {
 	}
 
 	public LinphoneCoreException(String detailMessage,Throwable e) {
-		super(detailMessage);
+		super(detailMessage + "caused by ["+e.getClass().getName()+" "+ e.getMessage()+"]");
 		mE = e;
 	}
 
diff --git a/mediastreamer2 b/mediastreamer2
index 488263428..bc6c0ed4c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 4882634280c82ca495d5bebec482d2744ddb7f61
+Subproject commit bc6c0ed4c16db22c9d7cecec9d0c309c722e08ea