From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 Aug 2006 17:30:56 +0000 (+0000)
Subject: merge of 3c3ef4d5089ff130a82103510ee9ea45d610c9c6
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6ec29ce834cae6ae27f827c568627a25239e5f4;p=openembedded.git

merge of 3c3ef4d5089ff130a82103510ee9ea45d610c9c6
     and ba16691706ff35f9217480357f4d2046c526e0d2
---

b6ec29ce834cae6ae27f827c568627a25239e5f4