Merged branch 'master' of git://git.snow-crash.org/pkg-rrdtool.

diff --cc debian/changelog
index 90b1bbc6d8423e82d901ce91716c36373776f56f,ec98fb7860fa645271c893a856e7c47413e94354..30303a59360249440c70aa9fb26efbb0b1fec5ed
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,15 @@@
  rrdtool (1.3.8-2) UNRELEASED; urgency=low
  
 - -- Bernd Zeimetz <bzed@debian.org>  Mon, 13 Jul 2009 03:04:12 +0200
++  [ Bernd Zeimetz ]
+   * debian/rules:
+     - Prepare to build with Python 2.6.
+ 
++  [ Sebastian Harl ]
 +  * debian/README.Debian:
 +    - Added a note about <http://oss.oetiker.ch/rrdtool/pub/contrib/> as
 +      requested in #323969 and lost in 1.2.26-1.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Thu, 24 Sep 2009 11:50:44 +0200
  
  rrdtool (1.3.8-1) unstable; urgency=low