From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 24 Jul 2005 17:56:54 +0000 (+0000)
Subject: merge of 356722c1e96526d5963e6080fa85700fc49633d9
X-Git-Tag: Release-2010-05/1~9453^2~4069
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30931c232d0aabfd61ab05195d10feddf709243f;p=openembedded.git

merge of 356722c1e96526d5963e6080fa85700fc49633d9
     and 7207f6f24d4228e24dd9213ba0ef3aeaf2f5fd83
---

30931c232d0aabfd61ab05195d10feddf709243f