From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 May 2007 08:36:29 +0000 (+0000)
Subject: merge of '266ecf7b63664e3503a2eec2b609cc4d504973a6'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2^2^2~1^2~2^2~2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae4828cb0051694652eecdee2dcc032237453a20;p=openembedded.git

Merge ... '266ecf7b63664e3503a2eec2b609cc4d504973a6'
     and '3fe173adf79372b5e29f63215a462e3f7cfdff08'
---

ae4828cb0051694652eecdee2dcc032237453a20