From: Matthias Hentges <oe@hentges.net>
Date: Thu, 20 Apr 2006 15:59:53 +0000 (+0000)
Subject: merge of 90d1e88cc511a5fa4c5ead58df2871041805bd57
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~50
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f51ab442976e16713aa131e019c5a93e3f968715;p=openembedded.git

merge of 90d1e88cc511a5fa4c5ead58df2871041805bd57
     and d41ca804a45faf802b41775a9e9623103423f05c
---

f51ab442976e16713aa131e019c5a93e3f968715