From: Jamie Lenehan <lenehan@twibble.org>
Date: Wed, 6 Jun 2007 02:35:13 +0000 (+0000)
Subject: merge of '114006d8480321d7b199ce8a9d4a6b805b96311d'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~78^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fec6771948e4e2849bb28c198fb266c34a3995ca;p=openembedded.git

Merge ... '114006d8480321d7b199ce8a9d4a6b805b96311d'
     and '60acb481a3d901c94a918e816dbd0c8e06fdebee'
---

fec6771948e4e2849bb28c198fb266c34a3995ca