From: Rene Wagner <rw@handhelds.org>
Date: Fri, 29 Jul 2005 21:17:08 +0000 (+0000)
Subject: merge of 22b6c89379f44959daad0672b60b3b2775b9364a
X-Git-Tag: Release-2010-05/1~9453^2~4017
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96311266fb4ee5b87fec4b64f65d42431dfe5b42;p=openembedded.git

merge of 22b6c89379f44959daad0672b60b3b2775b9364a
     and a9d332834a83bff1778ad969b7e1514a83a3c137
---

96311266fb4ee5b87fec4b64f65d42431dfe5b42