# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1361058689 18000
# Node ID 6a44bb3c95937ab99b86e266db12d912e83d0eba
# Parent  c5b4b9507a55abb856213721d5000f67b2539d2a# Parent  f47b8b3e2442dadc70240ecdf02cbf7b1c87b9da
maint: merge away extra head on stable

diff -r c5b4b9507a55 -r 6a44bb3c9593 .hgtags
--- a/.hgtags	Wed Feb 13 12:45:31 2013 -0800
+++ b/.hgtags	Sat Feb 16 18:51:29 2013 -0500
@@ -66,3 +66,4 @@
 a95432e7309ca6fc776c02939264bb6d443f3525 release-3-6-3
 2e8eb9ac43a5f8cfaf0423814a312ed47cb80485 rc-3-6-4-0
 858cbf6fc2ec1c232f5cf1d75dc344439b39a89c rc-3-6-4-1
+cc5a7d1233f3acea85648baeb754fc0e8f225225 rc-3-6-4-2
diff -r c5b4b9507a55 -r 6a44bb3c9593 configure.ac
--- a/configure.ac	Wed Feb 13 12:45:31 2013 -0800
+++ b/configure.ac	Sat Feb 16 18:51:29 2013 -0500
@@ -27,14 +27,14 @@
 EXTERN_CFLAGS="$CFLAGS"
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
-AC_INIT([GNU Octave], [3.6.4-rc1], [http://octave.org/bugs.html], [octave])
+AC_INIT([GNU Octave], [3.6.4-rc2], [http://octave.org/bugs.html], [octave])
 
 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg
 OCTAVE_VERSION="$PACKAGE_VERSION"
 OCTAVE_API_VERSION_NUMBER="48"
 OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+"
-OCTAVE_RELEASE_DATE="2013-01-03"
-OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others."
+OCTAVE_RELEASE_DATE="2013-02-11"
+OCTAVE_COPYRIGHT="Copyright (C) 2013 John W. Eaton and others."
 AC_SUBST(OCTAVE_VERSION)
 AC_SUBST(OCTAVE_API_VERSION_NUMBER)
 AC_SUBST(OCTAVE_API_VERSION)
diff -r c5b4b9507a55 -r 6a44bb3c9593 scripts/optimization/sqp.m
--- a/scripts/optimization/sqp.m	Wed Feb 13 12:45:31 2013 -0800
+++ b/scripts/optimization/sqp.m	Sat Feb 16 18:51:29 2013 -0500
@@ -760,7 +760,7 @@
 %!
 %! obj_opt = 0.0539498477702739;
 %!
-%! assert (all (abs (x-x_opt) < 5*sqrt (eps)) && abs (obj-obj_opt) < sqrt (eps));
+%! assert (all (abs (x-x_opt) < 8*sqrt (eps)) && abs (obj-obj_opt) < sqrt (eps));
 
 %% Test input validation
 %!error sqp ()