From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 23 Aug 2007 11:57:19 +0000 (+0000)
Subject: explicit merge of '77323b379f377a67b4d5bc05f4194d1d01309b52'
X-Git-Tag: Release-2010-05/1~8811^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce541bd7bcdfcda3a57888cc7b8da191a12567ef;p=openembedded.git

explicit merge of '77323b379f377a67b4d5bc05f4194d1d01309b52'
              and 'e0613a176614c74d38f49dfbdb46b6f368ef64ca'
---

ce541bd7bcdfcda3a57888cc7b8da191a12567ef
diff --cc MAINTAINERS
index 14a78517fb,7c445a7604..c77342d641
--- a/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