From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 26 Aug 2005 10:14:00 +0000 (+0000)
Subject: merge of 0e127465aab36f6067412b4ae8dc1d143975a5d2
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8acf15a3b7aff17ec888c476cd2deeb2271e5124;p=openembedded.git

merge of 0e127465aab36f6067412b4ae8dc1d143975a5d2
     and 13f41f22b28195db22a3edccf3d65864ffb89f46
---

8acf15a3b7aff17ec888c476cd2deeb2271e5124