From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 Aug 2005 13:14:36 +0000 (+0000)
Subject: merge of 573b5d78b5e0b180193dc60cf7ef9d57cb7fd657
X-Git-Tag: Release-2010-05/1~9453^2~3901
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f45a26339f26a4da01166c1969c5ea620f992883;p=openembedded.git

merge of 573b5d78b5e0b180193dc60cf7ef9d57cb7fd657
     and e04b75b646ac55cc032131167fa27c9cb86945a2
---

f45a26339f26a4da01166c1969c5ea620f992883