From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 21 Apr 2006 10:08:50 +0000 (+0000)
Subject: merge of 3bb8b4ecf78d2acc4e8cd5cddaafc4e0386dab93
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ae892dc300673b51fb9eb2515a3b0e4f14ae587;p=openembedded.git

merge of 3bb8b4ecf78d2acc4e8cd5cddaafc4e0386dab93
     and 5a91a3e083f4ba2c925d3ef91b37a2d5b3387ad0
---

2ae892dc300673b51fb9eb2515a3b0e4f14ae587