Merge from trunk; up to 2013-03-02T21:05:52Z!eggert@cs.ucla.edu.

2 files changed, 5 insertions, 2 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 393cf56e993..da8dec5a0f6 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -90,7 +90,6 @@ BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
 CLASH_DETECTION
 DATA_SEG_BITS
-DATA_START
 DEFAULT_SOUND_DEVICE
 DEVICE_SEP
 DIRECTORY_SEP
@@ -408,7 +407,6 @@ NO_EDITRES
 NSIG
 NSIG_MINIMUM
 NULL_DEVICE
-ORDINARY_LINK
 PAGESIZE
 PREFER_VSUSP
 PTY_ITERATION
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7e72e10cd9f..28e25ad98a3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify data_start configuration (Bug#13783).
+        * CPP-DEFINES (DATA_START, ORDINARY_LINK): Remove.
+
 2013-02-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         Tune by using memchr and memrchr.