From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 Aug 2005 23:54:42 +0000 (+0000)
Subject: merge of 69894987a74901f755f23dcc5ff02467692a1d81
X-Git-Tag: Release-2010-05/1~9453^2~3964
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d182c562ac4bde9f90c09667046a5f936071ce3;p=openembedded.git

merge of 69894987a74901f755f23dcc5ff02467692a1d81
     and fc974e9671578c44c3b488a5ab0f5eb31d1ea9bf
---

2d182c562ac4bde9f90c09667046a5f936071ce3