From: Philip Balister <philip@balister.org>
Date: Sat, 5 May 2007 20:36:01 +0000 (+0000)
Subject: merge of 'bcb26d45f59e69826c0f1f99784cb544fe4d99f5'
X-Git-Tag: Release-2010-05/1~8868^2~633
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faf3482413a3d1a7e121aaf3fdff2497b56c089e;p=openembedded.git

Merge ... 'bcb26d45f59e69826c0f1f99784cb544fe4d99f5'
     and 'd6b64846e115c0e8068d0d352ef4993a3f19a381'
---

faf3482413a3d1a7e121aaf3fdff2497b56c089e