consistency between main branch and stable branch

diff --git a/CHANGES b/CHANGES
index fe499f071570f236c0e213c53a5c9eeae40862a1..a05a3dfa594b88772c0dfdf081c065d97b6a0173 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,16 +4,6 @@
 
  Changes between 0.9.6b and 0.9.6c  [XX xxx XXXX]
 
-  *) Add support for shared libraries under Irix.
-     [Albert Chin-A-Young <china@thewrittenword.com>]
-
-  *) Add configuration option to build on Linux on both big-endian and
-     little-endian MIPS.
-     [Ralf Baechle <ralf@uni-koblenz.de>]
-
-  *) Add the possibility to create shared libraries on HP-UX
-     [Richard Levitte]
-
   *) [In 0.9.6c-engine release:]
      Add support for Broadcom crypto accelerator cards, backported
      from 0.9.7.
@@ -570,6 +560,16 @@
      be changed again when we can guarantee backward binary compatibility.
      [Richard Levitte]
 
+  *) Add support for shared libraries under Irix.
+     [Albert Chin-A-Young <china@thewrittenword.com>]
+
+  *) Add configuration option to build on Linux on both big-endian and
+     little-endian MIPS.
+     [Ralf Baechle <ralf@uni-koblenz.de>]
+
+  *) Add the possibility to create shared libraries on HP-UX
+     [Richard Levitte]
+
   *) Fix typo in get_cert_by_subject() in by_dir.c
      [Jean-Marc Desperrier <jean-marc.desperrier@certplus.com>]