From e993a6b079654a45e54cfc61e3bf2851751a469e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 26 Apr 2010 10:13:15 +0200
Subject: [PATCH] add to changelog

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cc88160..f2becd4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+1.2
+-------------------------
+
+- introduce a new data input/output mechanism to allow the master side 
+  to send and receive data from a slave. 
+
+- fix PyPI description 
+
 1.1
 -------------------------