From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 3 Jun 2006 22:12:19 +0000 (+0000)
Subject: merge of 7086df3f26c4f3f859bc974370b0550cc148fbdd
X-Git-Tag: Release-2010-05/1~9453^2~1506
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48ea61e97b5841e4e400aced0b7087dfe297f034;p=openembedded.git

merge of 7086df3f26c4f3f859bc974370b0550cc148fbdd
     and bdb1cb195b21191dfe20d0c9d7089c2bcabad18e
---

48ea61e97b5841e4e400aced0b7087dfe297f034