From: Koen Kooi <koen@openembedded.org>
Date: Sun, 4 Sep 2005 21:44:13 +0000 (+0000)
Subject: merge of 7520de304a270fbab16bd5fe46ec31e3fe275d51
X-Git-Tag: Release-2010-05/1~9453^2~3648^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3fc3adfe82f006b9293c16fc2e6cc338e0b830c;p=openembedded.git

merge of 7520de304a270fbab16bd5fe46ec31e3fe275d51
     and 83d783506adf2e4fdcf6dc9a8381006b0756ed73
---

d3fc3adfe82f006b9293c16fc2e6cc338e0b830c