From: Rene Wagner <rw@handhelds.org>
Date: Tue, 31 Jan 2006 20:38:28 +0000 (+0000)
Subject: merge of 652c21965b8f4efd9c6793bab6fa53f1364d13e1
X-Git-Tag: Release-2010-05/1~9453^2~2473^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15b68984f261f62968733e3534bf14aa1e0cf67c;p=openembedded.git

merge of 652c21965b8f4efd9c6793bab6fa53f1364d13e1
     and 892ce9ae745dea2c7ecb924566d1bc40ae2abbd5
---

15b68984f261f62968733e3534bf14aa1e0cf67c