From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 21 May 2007 20:53:23 +0000 (+0000)
Subject: merge of '0c41f3612b1aad220f3804e0288528ad8eba750d'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeae0ead4de39797ef077cca856ccf5821a05df3;p=openembedded.git

Merge ... '0c41f3612b1aad220f3804e0288528ad8eba750d'
     and '82e43060128c986b8be96797125a37a72d6d6aef'
---

eeae0ead4de39797ef077cca856ccf5821a05df3