From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 May 2007 09:30:07 +0000 (+0000)
Subject: merge of '5a3e35979062f8e60667cd96d53f07e386b51aba'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b68060e7ce762283660551ea22c3ca5e43ef264b;p=openembedded.git

Merge ... '5a3e35979062f8e60667cd96d53f07e386b51aba'
     and '8a4d576b3d74319becbab6ba2aeec2ef416536be'
---

b68060e7ce762283660551ea22c3ca5e43ef264b