explicit merge of '77323b379f377a67b4d5bc05f4194d1d01309b52'

              and 'e0613a176614c74d38f49dfbdb46b6f368ef64ca'

diff --cc MAINTAINERS
index 14a7851,7c445a7..c77342d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -213,9 -213,7 +213,14 @@@ Recipes:    lcdproc, libol, mailx, mysq
  Recipes:    radlib, scsi-idle, rng-tools, slugos-init, syslog-ng
  Recipes:    vsftpd, zd1211
  
+ Person:     Henning Heinold 'woglinde'
+ Mail:       heinold@inf.fu-berlin.de
+ Machines:   simpad
+ Recipes:    classpath-minimal, midpath, cacao-clcd
++
 +Person:     Philipp Zabel
 +Mail:       philipp.zabel@gmail.com
 +Interests:  Kernels, PXA, GTK+, gsmd
 +Distros:    Ångström
 +Machines:   hx4700, magician
 +Recipes:    avahi, libgsmd