From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 19 Aug 2006 09:46:02 +0000 (+0000)
Subject: merge of 12b4667b76c08327e3ca82f9f5c36daaa1be3c4e
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~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c73779b35a4f2f03e3d1ee84c50c09f65401c51e;p=openembedded.git

merge of 12b4667b76c08327e3ca82f9f5c36daaa1be3c4e
     and 4d988d8f1e760a866518bf0804a1ca8c02118b21
---

c73779b35a4f2f03e3d1ee84c50c09f65401c51e