From 91c8674acf311f825bf8e6c48d8fdc8b6c382ecc Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Sun, 7 Mar 2004 16:52:14 +0000
Subject: [PATCH] 2.7.1

2004-03-07  Havoc Pennington  <hp@redhat.com>

	* configure.in: 2.7.1
---
 ChangeLog    |  4 ++++
 NEWS         | 12 ++++++++++++
 configure.in |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e9be8b298..5fc7f93b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-07  Havoc Pennington  <hp@redhat.com>
+
+	* configure.in: 2.7.1
+
 2004-03-04  Paisa Seeluangsawat  <paisa@users.sf.net>
 
 	* configure.in: Added "th" (Thai) to ALL_LINGUAS.
diff --git a/NEWS b/NEWS
index 3aeb017a4..ea8ae76e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+2.7.1
+===
+
+Thanks to Rob Adams for fixes in this release.
+
+ - bug #122016 - fix a focus race
+ - Change move_to_workspace_left/right/up/down keybindings to
+   <Control><Alt><Shift> arrow to avoid conflicting with new
+   keybindings in spacial nautilus.
+ - fix dialog stacking order issues so e.g. panel properties 
+   dialog is above the panel
+
 2.7.0
 ===
 
diff --git a/configure.in b/configure.in
index f35a0d568..5ecad0bc8 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
 
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987 
 # releases on a branch add a 4th version like 2.4.21.1
-AM_INIT_AUTOMAKE(metacity, 2.7.0)
+AM_INIT_AUTOMAKE(metacity, 2.7.1)
 
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"