From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 14 Aug 2005 17:37:03 +0000 (+0000)
Subject: merge of e0ad7669467beb214dbbaa5169e94b07b29044c8
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~26^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91b5c2c53255a137beb728bb2fb01b39db6a9afe;p=openembedded.git

merge of e0ad7669467beb214dbbaa5169e94b07b29044c8
     and fadeaf2a4abec5f30afab4e5e8519a1687ee6116
---

91b5c2c53255a137beb728bb2fb01b39db6a9afe