From: Philip Balister <philip@balister.org>
Date: Fri, 1 Jun 2007 17:38:18 +0000 (+0000)
Subject: merge of '7474030a47375702cb66f00aa7ded40e585cf3fd'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~72^2~3^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11b2f5bb1f6f2f7b45d1cab6f6a75916db8b23a6;p=openembedded.git

Merge ... '7474030a47375702cb66f00aa7ded40e585cf3fd'
     and '9f671f6c3a17dbd8450e267353cf95d120238e50'
---

11b2f5bb1f6f2f7b45d1cab6f6a75916db8b23a6