From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 12 Jul 2005 10:50:07 +0000 (+0000)
Subject: merge of 608719661f2b529992817aca005186cc9ffd5807
X-Git-Tag: Release-2010-05/1~9453^2~4186^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfffca6e63be1f3fb96a98fb0c047e9d5b2a2ac9;p=openembedded.git

merge of 608719661f2b529992817aca005186cc9ffd5807
     and 70aa3da0eaab1da0ad6716e4284a19687ea7492a
---

dfffca6e63be1f3fb96a98fb0c047e9d5b2a2ac9