From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 24 Aug 2005 19:07:29 +0000 (+0000)
Subject: merge of 65c6c7a1cf1b7e4160d7a1a4edee5f1cdfb017d0
X-Git-Tag: Release-2010-05/1~9453^2~3804^2~4^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d897058ee420e6ac26a177c34b6fbbc4452f61c;p=openembedded.git

merge of 65c6c7a1cf1b7e4160d7a1a4edee5f1cdfb017d0
     and e0add06e360adc0ac4763c1fe91d0166abfcb4dd
---

6d897058ee420e6ac26a177c34b6fbbc4452f61c