From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 17 Jul 2005 23:29:04 +0000 (+0000)
Subject: merge of 9c0265ee62d37de050c68ecb28894baf95259be9
X-Git-Tag: Release-2010-05/1~9453^2~4135^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11fbb9b086d25e4d8f5368dbb8e2ec063a07afff;p=openembedded.git

merge of 9c0265ee62d37de050c68ecb28894baf95259be9
     and ca2bea4d24652633389a1f553be61c6b824f3b72
---

11fbb9b086d25e4d8f5368dbb8e2ec063a07afff