From 2b20e40805c320296b53d59313c504a48cdb3b26 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 30 Apr 2010 16:28:10 +0200
Subject: [PATCH] update CHANGELOG

---
 CHANGELOG | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c5a61f0..31cfb6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,14 +3,11 @@
 
 - fix issue79: sessionfinish/teardown hooks more systematically 
   on the slave side 
-
 - introduce a new data input/output mechanism to allow the master side 
   to send and receive data from a slave. 
-
-- use new register hooks facility of py.test>=1.2.2 
-
+- fix race condition in underlying pickling/unpickling handling 
+- use and require new register hooks facility of py.test>=1.2.2 
 - fix some python3 related pickling related race conditions 
-
 - fix PyPI description 
 
 1.1