From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 1 Jun 2006 22:52:43 +0000 (+0000)
Subject: merge of 6564927a60e6ae419e0ce8e3df08a4d778c193bc
X-Git-Tag: Release-2010-05/1~9453^2~1511
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa27b6f89d69864e710637d7411a7a1bcf5a537e;p=openembedded.git

merge of 6564927a60e6ae419e0ce8e3df08a4d778c193bc
     and cc55c113a93ff0cca026956716e79f0fecb52ad2
---

aa27b6f89d69864e710637d7411a7a1bcf5a537e