From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 21 Jul 2005 11:56:43 +0000 (+0000)
Subject: merge of 9670e736a83e6a2cd24cf9ee212df96f51b9f7c2
X-Git-Tag: Release-2010-05/1~9453^2~4102
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a78c0d50d94f25d71da5d52d3fd8975a670fc55c;p=openembedded.git

merge of 9670e736a83e6a2cd24cf9ee212df96f51b9f7c2
     and d70f182e969169a90e7b31e49ef541b824500c5f
---

a78c0d50d94f25d71da5d52d3fd8975a670fc55c