From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 19:25:01 +0000 (+0000)
Subject: merge of 06d7a9b5635f914bdc4200f0f4f62459081f13db
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1^2~1^2^2^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eaf351d143f56e575e8eb041bc26400e6f93a95;p=openembedded.git

merge of 06d7a9b5635f914bdc4200f0f4f62459081f13db
     and 10926eec6b5cb3adcd7df2208e2378bd1fc98cbd
---

7eaf351d143f56e575e8eb041bc26400e6f93a95