From: Rene Wagner <rw@handhelds.org>
Date: Tue, 2 Aug 2005 11:46:34 +0000 (+0000)
Subject: merge of 1beafa4fcb9ecf190124315ed93b26f68496cff2
X-Git-Tag: Release-2010-05/1~9453^2~4013
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0e977b19118801be51a6125784d01e6bde7aca8;p=openembedded.git

merge of 1beafa4fcb9ecf190124315ed93b26f68496cff2
     and d16bc24438423bde7907f19a631f690c0315bfdb
---

e0e977b19118801be51a6125784d01e6bde7aca8