From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 7 Feb 2008 13:58:35 +0000 (+0000)
Subject: merge of '7ab7cd009151ed33e67d7c5eda14b7f7dff8c9a8'
X-Git-Tag: Release-2010-05/1~7713^2~27^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=201305fe39e86c104f1de7c40194f8692047e684;p=openembedded.git

Merge ... '7ab7cd009151ed33e67d7c5eda14b7f7dff8c9a8'
     and 'c20a54aa8e31679eab91bd7856ec168bce74a60e'
---

201305fe39e86c104f1de7c40194f8692047e684