Separate SlapOS and original changes.

Avoid unnecessary conflicts during merges.

CHANGES.SlapOS.txt

+1.5.3-dev-SlapOS-011
+--------------------
+
+- No changes yet.
+
+1.5.3-dev-SlapOS-010
+--------------------
+
+- Make networkcache immune to slapos.libnetworkcache errors.
+
+1.5.3-dev-SlapOS-009
+--------------------
+
+- Implement networkcache SSL authentication.
+
+1.5.3-dev-SlapOS-008
+--------------------
+
+- Fix 1.5.3-dev-SlapOS-007: workaround was not working.
+
+1.5.3-dev-SlapOS-007
+--------------------
+
+- Workaround M2Crypto https redirect download bug:
+   https://bugzilla.osafoundation.org/show_bug.cgi?id=13033
+
+1.5.3-dev-SlapOS-006
+--------------------
+
+- Implemented networkcache signature creation and checking.
+- Fixed slapos.libnetworkcache installation during bootstrap.
+
+1.5.3-dev-SlapOS-005
+--------------------
+
+- Followed API changes in slapos.libnetworkcache.
+
+1.5.3-dev-SlapOS-004
+--------------------
+
+- Re added support for _profile_base_location_ mistakenely removed in
+  1.5.3-dev-SlapOS-003.
+
+1.5.3-dev-SlapOS-003
+--------------------
+
+- Support networkcache by slapos.libnetworkcache library.
+
+- Make extends less hungry for network, by making URLs canonical.
+
+Bugs fixed:
+
+- Fix exception hiding in checksum error redownloading.
+
+1.5.3-dev-SlapOS-001
+--------------------
+
+- Make ${:_profile_location_} and ${:_profile_base_location_} parameters
+  available in parts to access current profile location (url, path)
+  or base location (base of url or path).
+
+- Add --buildout-download-base to bootstrap.py parameters in order to being
+  able to choose fully custom zc.buildout distribution location.
+
+- Redownload once files with wrong checksum in download cache.

CHANGES.txt

@@ -4,71 +4,6 @@ Change History
 1.5.3 (unreleased)
 ==================
 
-
-1.5.3-dev-SlapOS-011
---------------------
-
-- No changes yet.
-
-1.5.3-dev-SlapOS-010
---------------------
-
-- Make networkcache immune to slapos.libnetworkcache errors.
-
-1.5.3-dev-SlapOS-009
---------------------
-
-- Implement networkcache SSL authentication.
-
-1.5.3-dev-SlapOS-008
---------------------
-
-- Fix 1.5.3-dev-SlapOS-007: workaround was not working.
-
-1.5.3-dev-SlapOS-007
---------------------
-
-- Workaround M2Crypto https redirect download bug:
-   https://bugzilla.osafoundation.org/show_bug.cgi?id=13033
-
-1.5.3-dev-SlapOS-006
---------------------
-
-- Implemented networkcache signature creation and checking.
-- Fixed slapos.libnetworkcache installation during bootstrap.
-
-1.5.3-dev-SlapOS-005
---------------------
-
-- Followed API changes in slapos.libnetworkcache.
-
-1.5.3-dev-SlapOS-004
---------------------
-
-- Re added support for _profile_base_location_ mistakenely removed in
-  1.5.3-dev-SlapOS-003.
-
-1.5.3-dev-SlapOS-003
---------------------
-
-- Support networkcache by slapos.libnetworkcache library.
-
-- Make extends less hungry for network, by making URLs canonical.
-
-Bugs fixed:
-
-- Fix exception hiding in checksum error redownloading.
-
-1.5.3-dev-SlapOS-001
---------------------
-
-- Make ${:_profile_location_} and ${:_profile_base_location_} parameters
-  available in parts to access current profile location (url, path)
-  or base location (base of url or path).
-
-- Add --buildout-download-base to bootstrap.py parameters in order to being
-  able to choose fully custom zc.buildout distribution location.
-
 - Introduce a cache for the expensive `buildout._dir_hash` function.
 
 - Remove duplicate path from script's sys.path setup.
@@ -92,8 +27,6 @@ Bugs fixed:
 - Removed any traces of the implementation of ``extended-by``. Raise a
   UserError if the option is encountered instead of ignoring it, though.
 
-- Redownload once files with wrong checksum in download cache.
-
 1.5.2 (2010-10-11)
 ==================