From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 17 Sep 2005 18:17:24 +0000 (+0000)
Subject: merge of 0a6a434569e334132e34bc3e542f512c7505ba89
X-Git-Tag: Release-2010-05/1~9453^2~3499
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16e2f8efc0c366a91f2d7f934f87b238c1ba540c;p=openembedded.git

merge of 0a6a434569e334132e34bc3e542f512c7505ba89
     and 912340c2ffb2a6e611a7a4144472515e1110d583
---

16e2f8efc0c366a91f2d7f934f87b238c1ba540c