From: Erik Hovland <erik@hovland.org>
Date: Tue, 23 May 2006 16:52:34 +0000 (+0000)
Subject: merge of ce94922846908c2edd7362a56618ea051b244c3b
X-Git-Tag: Release-2010-05/1~9453^2~1624^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f85602e94b6b24559cae12c5ccfc5b22c8bf9d6f;p=openembedded.git

merge of ce94922846908c2edd7362a56618ea051b244c3b
     and f3d0cda096d15213040e8dd3f198a10398314030
---

f85602e94b6b24559cae12c5ccfc5b22c8bf9d6f