From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 15 Aug 2006 06:16:26 +0000 (+0000)
Subject: merge of 6f8490048134c6e6b72e44c0685e72338477cc2a
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^2~4^2^2~2^2^2^2~2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=975c8e4d5713a5bc618ba15738b8aa00671f106c;p=openembedded.git

merge of 6f8490048134c6e6b72e44c0685e72338477cc2a
     and d7c21028acaafe89a817f470db893945ce719268
---

975c8e4d5713a5bc618ba15738b8aa00671f106c