Merge branch 'kibi'

* kibi:
  d-i.debian.org: Adjust package list.

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 2fb83f50aacf8dd3582f2687a060d0d499b432f5,a4154eb8cd19379812b24362d4ebad584beda541..0221241ea8d695baf84d41a0544a68fcdc7e512d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -16,13 -16,18 +16,25 @@@ debian.org (53) UNRELEASED; urgency=lo
    * d/control: add postgresql-client to qa.debian.org
      - Apply patch from Bart Martens
  
 +  [ Enrico Zini ]
 +  * nm.d.o update:
 +    + python-lzma
 +
 +  [ Raphaël Hertzog ]
 +  * Add initial meta-package for tracker.debian.org.
 +
+   [ Cyril Brulebois ]
+   * d-i.debian.org:
+     + libfile-slurp-perl
+     + mr
+     + gettext
+     + poxml
+     + xsltproc
+     + docbook-xml
+     + docbook-xsl
+     + graphviz
+     + edos-distcheck
+ 
   -- Bernhard R. Link <brlink@debian.org>  Sun, 13 Oct 2013 11:55:19 +0200
  
  debian.org (52) unstable; urgency=low

diff --cc debian/control
Simple merge