From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 15 Jun 2006 07:46:04 +0000 (+0000)
Subject: merge of 6c5f6dd92dc9e167c3598305801931820379802a
X-Git-Tag: Release-2010-05/1~9453^2~1453^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc32d171b52e7a268b49b6324c0d10fe7b5052d0;p=openembedded.git

merge of 6c5f6dd92dc9e167c3598305801931820379802a
     and dbb4f8c5ce9d6875e4b652532e08c39932325b64
---

dc32d171b52e7a268b49b6324c0d10fe7b5052d0