From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 12 Apr 2007 10:41:25 +0000 (+0000)
Subject: merge of 'd05c5906a41430c5dafdf6adb260f8aceefeeec1'
X-Git-Tag: Release-2010-05/1~8868^2~699^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2167a483dd9d48ed814422e04ca6f461dbceede;p=openembedded.git

Merge ... 'd05c5906a41430c5dafdf6adb260f8aceefeeec1'
     and 'fdec91dbfe8a80988486ab34e99357cab36f7154'
---

e2167a483dd9d48ed814422e04ca6f461dbceede