From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Jun 2007 22:11:20 +0000 (+0000)
Subject: merge of '63f976f7eeeabc5489e45b1df04c88319cd77447'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6db07724347d98a16670844ad3111628a7b9e4d;p=openembedded.git

Merge ... '63f976f7eeeabc5489e45b1df04c88319cd77447'
     and 'f20a9853a5bcc15b88f7b9aa12eedd2fd6d65ec3'
---

d6db07724347d98a16670844ad3111628a7b9e4d