From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 12 Apr 2007 00:55:36 +0000 (+0000)
Subject: merge of '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2^2~4^2~1^2~1^2^2^2^2^2~1^2^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c88ccfd52ca1554f2173eb95f66c3d4e709ffcbc;p=openembedded.git

Merge ... '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
     and '4758fedca3a1292214bf6a18707cf62a76cf3c6c'
---

c88ccfd52ca1554f2173eb95f66c3d4e709ffcbc