From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 12 Sep 2005 16:14:44 +0000 (+0000)
Subject: merge of 720a8c74ee3b12838375231f9349f202ff0346ba
X-Git-Tag: Release-2010-05/1~9453^2~3545
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1e1a8675c7008f1470b6a9b6d51fd832a3f2957;p=openembedded.git

merge of 720a8c74ee3b12838375231f9349f202ff0346ba
     and 722a138341d915ac33993d232e5375f1aa747921
---

e1e1a8675c7008f1470b6a9b6d51fd832a3f2957