From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 30 Aug 2005 18:31:54 +0000 (+0000)
Subject: merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
X-Git-Tag: Release-2010-05/1~9453^2~3739^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e100758d2bddfea76e145acb56a069eb88f577fb;p=openembedded.git

merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
     and 8457b71bad4cfb28c762765d33e5ab6b8434afa9
---

e100758d2bddfea76e145acb56a069eb88f577fb