From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 4 Sep 2007 12:28:34 +0000 (+0000)
Subject: merge of '3fed235384e32b1c9ba26c86ff39b2ffb928fbed'
X-Git-Tag: Release-2010-05/1~8701^2~8^2~1^2~1^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1decee2fa068b2c5bc0aaa9ea3bb1ca033350013;p=openembedded.git

Merge ... '3fed235384e32b1c9ba26c86ff39b2ffb928fbed'
     and '91c294cf36aad0c7fb931e23dfd4c912b02143f0'
---

1decee2fa068b2c5bc0aaa9ea3bb1ca033350013