From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 25 Mar 2008 03:16:02 +0000 (+0000)
Subject: merge of '089057d0f120a7856abf8245745dc0cddf2018de'
X-Git-Tag: Release-2010-05/1~7280^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=852b7bc38f9f7a4b5f4e896b04354835be1b2c68;p=openembedded.git

Merge ... '089057d0f120a7856abf8245745dc0cddf2018de'
     and 'bfbb7a4b91b1cef9bf586944b836302144e3c8b0'
---

852b7bc38f9f7a4b5f4e896b04354835be1b2c68