From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 23 Aug 2006 12:16:19 +0000 (+0000)
Subject: merge of 18f668005ae8b816cbb685308d7763c7de8ed15a
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44e736c7407ec784127d128f172e3ecf4794df0d;p=openembedded.git

merge of 18f668005ae8b816cbb685308d7763c7de8ed15a
     and 488c9a7c1f4d87055460407f126116107e233be5
---

44e736c7407ec784127d128f172e3ecf4794df0d