From: Rene Wagner <rw@handhelds.org>
Date: Sat, 20 Aug 2005 12:59:23 +0000 (+0000)
Subject: merge of 18e74576d6a6dbe1c24ecfa4f3a7d57f30e979db
X-Git-Tag: Release-2010-05/1~9453^2~3879
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a7df4494bc9678334ed1ba386d4083777c41aed;p=openembedded.git

merge of 18e74576d6a6dbe1c24ecfa4f3a7d57f30e979db
     and d4d1a8121b8f063ec17cda4da0bb104be219efd6
---

1a7df4494bc9678334ed1ba386d4083777c41aed