From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 10 Oct 2005 12:48:25 +0000 (+0000)
Subject: merge of 2d151a396c36bdb08948d221edbf6c5391eaf067
X-Git-Tag: Release-2010-05/1~9453^2~3286^2~9^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f87dce4ec0f90174ed09255f68c750c4d88cc25;p=openembedded.git

merge of 2d151a396c36bdb08948d221edbf6c5391eaf067
     and d72f9e2df6f619bf150275a643da358b708c3bdd
---

7f87dce4ec0f90174ed09255f68c750c4d88cc25