--- a/ChangeLog	Tue Aug 30 12:30:04 2011 +0200
+++ b/ChangeLog	Fri Sep 30 04:30:26 2011 +0100
@@ -1,3 +1,7 @@
+2011-09-30  Andrew John Hughes  <ahughes@redhat.com>
+
+	* NEWS: Cleanup.
+
 2011-08-30  Xerxes Rånby  <xerxes@zafena.se>
 
 	CACAO

--- a/NEWS	Tue Aug 30 12:30:04 2011 +0200
+++ b/NEWS	Fri Sep 30 04:30:26 2011 +0100
@@ -26,20 +26,25 @@
   - S7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
   - S7073913: Avoid random segfaults.
 * Zero/Shark
-  - PR757, 7066143: 7009309 regression: x86 stubRoutines
-  - PR753, 7066143: 7009923 regression
+  - PR757, S7066143: 7009309 regression: x86 stubRoutines
+  - PR753, S7066143: 7009923 regression
   - PR770: Zero 7033954 regression: missing mapfile
   - methodHandles_zero missing.
   - sharkContext typo in assert
   - sharedRuntime needs rework after indy reorg
   - Add missing describe_pd method for Zero.
+* CACAO
+  - CA149: Used wrong class loader.
+  - CA159: Exception handler blocks / register mixup.
+  - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): [OPENJDK] stack index of caller was off by one, causing many apt (Annotation Processing Tool) failures.
+  - Set thread to RUNNABLE during Thread.start.
+  - Removed state-setting function call that would be done by the thread itself, creating a nasty race.
 * JamVM
   - JamVM is self-hosting.
   - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit.
   - LP827463: Fix OpenJDK enclosingMethodInfo().
   - Add support for armhf.
-  - Skip Java-reflection-related DelegatingClassLoaders,
-    enables JamVM to run NetBeans.
+  - Skip Java-reflection-related DelegatingClassLoaders, enables JamVM to run NetBeans.
   - Generic JNI stubs for common JNI method signatures.
   - Fix memory heap arguments in terms of gigabytes.
   - armhf: ensure stack is 8 byte aligned.
@@ -107,14 +112,6 @@
   - MIPS: 64-bit and interpreter inlining by default.
   - Trivial implementation of stubs for MIPS.
 * CACAO
-  - CA149: Used wrong class loader.
-  - CA159: Exception handler blocks / register mixup.
-  - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): [OPENJDK] stack
-    index of caller was off by one, causing many apt
-    (Annotation Processing Tool) failures.
-  - Set thread to RUNNABLE during Thread.start.
-  - Removed state-setting function call that would be done by the thread itself,
-    creating a nasty race.
   - Threadlist & threadobject improvements.
   - Ignore all unknown options, but report them.
   - Fixes build for newer gcc (at least 4.4) on PPC64, breaks older gcc.