From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 27 Apr 2007 20:32:26 +0000 (+0000)
Subject: merge of '64b6093032eef8f7c38258a8a93dfdc4ea46c39c'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29d2ce29c038960091f61ba54f788741b9c121f8;p=openembedded.git

Merge ... '64b6093032eef8f7c38258a8a93dfdc4ea46c39c'
     and 'df36391938bd296ae238e5e7c286a075be0015a6'
---

29d2ce29c038960091f61ba54f788741b9c121f8