From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 2 Oct 2006 18:09:04 +0000 (+0000)
Subject: merge of 0b5e6bdf56efa0e135a5c541490fd6bfdbe9c8d0
X-Git-Tag: Release-2010-05/1~9453^2~642
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a8c2452469361c8b426b08443077d0ae60f25b2;p=openembedded.git

merge of 0b5e6bdf56efa0e135a5c541490fd6bfdbe9c8d0
     and b4ec3864cbd2f012682dcfb6d013d215a83b72df
---

9a8c2452469361c8b426b08443077d0ae60f25b2