[empathy/gnome-3-0: 1/2] prepare 3.0.2

[Guillaume Desmottes <gdesmott src gnome org>]

commit b392129bc131bf4da447fa03c2a37b6be9d9240b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon May 23 16:19:57 2011 +0200

    prepare 3.0.2

 NEWS         |   18 ++++++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 9a7308d..e51cd7e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+NEW in 3.0.2 (23/05/2011)
+============
+
+Once again, no big changes in this stable release but still worth an update.
+
+Bugs fixed:
+ - Fixed #648842, Notifications are delayed if contacts send messages too fast (Guillaume Desmottes)
+ - Fixed #648914, Favourite contacts appear in other contact list groups when offline (Guillaume Desmottes)
+ - Fixed #649161, Leak in main_window_flash_foreach (Guillaume Desmottes)
+ - Fixed #649273, empathy-chat exits even if there is disconnected chat (Guillaume Desmottes)
+ - Fixed #649379, Some files in libempathy-gtk use gi18n.h instead of gi18n-lib.h (Gabor Kelemen)
+ - Fixed #650015, Chatroom joined but not displayed (Guillaume Desmottes)
+ - Fixed #650590, cell-renderer-expander: fix rendering with GTK+3 (Cosimo Cecchi)
+ - Fixed #650854, Fix expand/fill of some account widgets (Guillaume Desmottes)
+
+Translations:
+ - Updated fr Translation (Bruno Brouard)
+
 NEW in 3.0.1 (25/04/2011)
 ============
 
diff --git a/configure.ac b/configure.ac
index d3918de..0d5ff11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [0])
-m4_define([empathy_micro_version], [1])
+m4_define([empathy_micro_version], [2])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'