[empathy/gnome-3-4] Prepare 3.4.2.1

[Guillaume Desmottes <gdesmott src gnome org>]

commit 71cab9b191860ec1208cc4b144be9409e16f780a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon May 21 14:04:48 2012 +0200

    Prepare 3.4.2.1

 NEWS         |   14 ++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index c2983c4..2c78451 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+NEW in 3.4.2.1 (21/05/2012)
+==============
+
+This release fixes various issues in the call UI and a crash when taking
+a picture from the avatar chooser dialog.
+
+Dependencies:
+ â clutter-gtk â 1.1.2
+ â cheese â 3.4.0 (optional)
+
+Bugs fixed:
+ - Fixed #670874, floating toolbar not working (Sjoerd Simons)
+ - Fixed #674553, Take picture button in image change doesn't work. (Guillaume Desmottes)
+
 NEW in 3.4.2 (14/05/2012)
 ============
 
diff --git a/configure.ac b/configure.ac
index eebe697..d343a0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 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], [4])
 m4_define([empathy_micro_version], [2])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],