From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 6 Aug 2007 11:04:38 +0000 (+0000)
Subject: merge of '0f0d473a082d7b3643a49221ef58800654470d80'
X-Git-Tag: Release-2010-05/1~8868^2~1^2^2~4^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f981d5e7a407b1218f6c189fe803703cb8857483;p=openembedded.git

Merge ... '0f0d473a082d7b3643a49221ef58800654470d80'
     and '8416ad85221db47c91cfb9a3991e6f564dc834f9'
---

f981d5e7a407b1218f6c189fe803703cb8857483