Merge branch 'master' of git@apu.snow-crash.org:pkg-rrdtool

Conflicts:

	debian/changelog

diff --cc debian/changelog
index 5dbd578f94f75df847a207aeefa5ebc2d2b7ec4f,cda3348191b8b8c41504b16f2bf4a52b9b493f6d..ab9797edbcadd09f52826747878fe93072433685
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -9,11 -10,13 +10,15 @@@ rrdtool (1.2.27-1) unstable; urgency=lo
        case that produces a SIGFPE (Closes: #428778). Patch created by
        David Martínez Moreno.
    * debian/control:
 -    - Removing the ttf-dejavu dependency from librrd2.
 +    - Removing the ttf-dejavu dependency from librrd2 (Closes: #390617).
 +    - Builds with -O2 segfault on arm, so disable it on arm for now until the
 +      bug is properly debugged, which will take some time (Closes: #447041).
  
-  -- Bernd Zeimetz <bzed@debian.org>  Sun, 24 Feb 2008 20:23:31 +0100
+   [ Sebastian Harl ]
+   * Adding debian/patches/typo by David Martínez Moreno to fix some typos
+     (Closes: #432340).
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Sun, 24 Feb 2008 18:44:41 +0100
  
  rrdtool (1.2.26-1) unstable; urgency=low
  

diff --cc debian/rules
Simple merge