From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 7 Jun 2007 09:48:01 +0000 (+0000)
Subject: merge of '0c667a35be10770cb3368fea6703de654299e6a3'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5c2fe65dea478cc359b6977791e0d016f1fb707;p=openembedded.git

Merge ... '0c667a35be10770cb3368fea6703de654299e6a3'
     and '1ab663214c75f15191022cd0009603778fc2e828'
---

a5c2fe65dea478cc359b6977791e0d016f1fb707