From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 26 May 2006 20:52:01 +0000 (+0000)
Subject: merge of 4df4d7b459a3415cf0a91eca732e547c9ba278a6
X-Git-Tag: Release-2010-05/1~9453^2~1614
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=742627c86660c059f291c349e4922357b4a38a03;p=openembedded.git

merge of 4df4d7b459a3415cf0a91eca732e547c9ba278a6
     and be0f87375d77d8115b0c83b7a9b731eb5062802d
---

742627c86660c059f291c349e4922357b4a38a03