From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 11 Sep 2005 18:07:53 +0000 (+0000)
Subject: merge of 427dc4e4b02069584f06135f74bd23cb80490c8b
X-Git-Tag: Release-2010-05/1~9453^2~3556
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39c4dfc4f4d95abef3a32cb4197a693d2789b410;p=openembedded.git

merge of 427dc4e4b02069584f06135f74bd23cb80490c8b
     and db10c295cf58e5701efeb931273b72f3ab0dbdd1
---

39c4dfc4f4d95abef3a32cb4197a693d2789b410