From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 7 Apr 2006 17:22:40 +0000 (+0000)
Subject: merge of 94b564900cca12eafeb635e5e42858918f06d86a
X-Git-Tag: Release-2010-05/1~9453^2~2086^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86485185e09b69eabebc98367ae6ff07ed553913;p=openembedded.git

merge of 94b564900cca12eafeb635e5e42858918f06d86a
     and c0c009a85be5cd4c4c3057c6ce86f866920ca8b9
---

86485185e09b69eabebc98367ae6ff07ed553913