From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 May 2006 12:57:11 +0000 (+0000)
Subject: merge of 7ee1ffcec438245a0a1840156021aef8230bb7e0
X-Git-Tag: Release-2010-05/1~9453^2~1709^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13e983ea44cd0b8e1b7fc7ff6fdb892658db80ad;p=openembedded.git

merge of 7ee1ffcec438245a0a1840156021aef8230bb7e0
     and d3c6eb18e534ee6e6046f023f47fd31a50959d3b
---

13e983ea44cd0b8e1b7fc7ff6fdb892658db80ad