From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 17 Aug 2008 12:52:24 +0000 (+0000)
Subject: merge of '4d056d24e9fd51cc15a2cafe9af79d82160d469c'
X-Git-Tag: Release-2010-05/1~6330^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca148602511eed7168486b50136f082397017c0f;p=openembedded.git

Merge ... '4d056d24e9fd51cc15a2cafe9af79d82160d469c'
     and '6cb662ad89603f32ad694010567c8c8a850a7516'
---

ca148602511eed7168486b50136f082397017c0f