From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 14 Jul 2005 21:23:39 +0000 (+0000)
Subject: merge of 626d9cf0d974243e86609b2dc64c3da55ebf97c9
X-Git-Tag: Release-2010-05/1~9453^2~4166
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19995655516577f27328b781395a3387831cebb6;p=openembedded.git

merge of 626d9cf0d974243e86609b2dc64c3da55ebf97c9
     and 69c4e49fd744532fd81f2b84827358e61dca53f7
---

19995655516577f27328b781395a3387831cebb6