diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index febf2a8694c29bcfde54fb5989abfb679d564d59..7ad0f82900478f086f54d01f2174c8be7b5da822 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-24 Benjamin Kosnik <bkoz@redhat.com>
+
+ * testsuite/28_regex/algorithms/02_match: To...
+ * testsuite/28_regex/algorithms/match: ...this.
+ * testsuite/28_regex/headers/04_header/regex/std_c++0x_neg.cc: Remove
+ duplicate.
+
2012-06-18 Jörg Sonnenberger <joerg@britannica.bec.de>
Jonathan Wakely <jwakely.gcc@gmail.com>
@@ -438,20 +445,20 @@
2012-04-12 Jeffrey Yasskin <jyasskin@google.com>
PR libstdc++/52822
- * include/bits/stl_algo.h (__find_if_not): Expose in C++98 mode.
- (__find_if_not_n): Like __find_if_not, but works on and updates a
+ * include/bits/stl_algo.h (__find_if_not): Expose in C++98 mode.
+ (__find_if_not_n): Like __find_if_not, but works on and updates a
counted range instead of a bounded range.
- (stable_partition): Guarantee !__pred(*__first) in call to
+ (stable_partition): Guarantee !__pred(*__first) in call to
__stable_partition_adaptive() or __inplace_stable_partition().
- (__stable_partition_adaptive): Use new precondition to avoid
+ (__stable_partition_adaptive): Use new precondition to avoid
moving/copying objects onto themselves. Guarantee new
precondition to recursive calls.
- (__inplace_stable_partition): Use new precondition to simplify
+ (__inplace_stable_partition): Use new precondition to simplify
base case, remove __last parameter. Guarantee new precondition to
recursive calls.
- * testsuite/25_algorithms/stable_partition/moveable.cc (test02):
+ * testsuite/25_algorithms/stable_partition/moveable.cc (test02):
Test a sequence that starts with a value matching the predicate.
- * testsuite/25_algorithms/stable_partition/pr52822.cc: Test
+ * testsuite/25_algorithms/stable_partition/pr52822.cc: Test
vectors, which have a destructive self-move-assignment.
2012-04-12 Andreas Schwab <schwab@linux-m68k.org>
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/basic/string_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/basic/string_01.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/basic/string_01.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/basic/string_01.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/basic/string_range_00_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/basic/string_range_00_03.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/basic/string_range_00_03.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/basic/string_range_00_03.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/basic/string_range_01_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/basic/string_range_01_03.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/basic/string_range_01_03.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/basic/string_range_01_03.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/basic/string_range_02_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/basic/string_range_02_03.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/basic/string_range_02_03.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/basic/string_range_02_03.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/cstring_plus.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/extended/cstring_plus.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/cstring_plus.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/extended/cstring_plus.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/cstring_questionmark.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/extended/cstring_questionmark.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/cstring_questionmark.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/extended/cstring_questionmark.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/string_any.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/extended/string_any.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/string_any.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/extended/string_any.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/string_range_00_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/extended/string_range_00_03.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/string_range_00_03.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/extended/string_range_00_03.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/string_range_01_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/extended/string_range_01_03.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/string_range_01_03.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/extended/string_range_01_03.cc
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/string_range_02_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/match/extended/string_range_02_03.cc
similarity index 100%
rename from libstdc++-v3/testsuite/28_regex/algorithms/02_match/extended/string_range_02_03.cc
rename to libstdc++-v3/testsuite/28_regex/algorithms/match/extended/string_range_02_03.cc
diff --git a/libstdc++-v3/testsuite/28_regex/headers/04_header/regex/std_c++0x_neg.cc b/libstdc++-v3/testsuite/28_regex/headers/04_header/regex/std_c++0x_neg.cc
deleted file mode 100644
index e8ddb77bbb389e5fdab0718dbb04bba3eda95ad9..0000000000000000000000000000000000000000
--- a/libstdc++-v3/testsuite/28_regex/headers/04_header/regex/std_c++0x_neg.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// { dg-do compile }
-// { dg-options "-std=gnu++98" }
-
-// Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <regex> // { dg-excess-errors "In file included from" }
-
-