From: Matthias Hentges <oe@hentges.net>
Date: Mon, 27 Mar 2006 16:38:24 +0000 (+0000)
Subject: merge of fa2942578b779e2f09210ed8416c89ed68c49837
X-Git-Tag: Release-2010-05/1~9453^2~2114^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=643b5b8338554da781462bee60944bfe901e0122;p=openembedded.git

merge of fa2942578b779e2f09210ed8416c89ed68c49837
     and 8809b1f1d7adf1812d6bf8155574eb4721370006
---

643b5b8338554da781462bee60944bfe901e0122