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

merge of 1ee22e5dc2cdeec8a88f1136a019329901a0c9f3
     and b971ecbe14a98d023c916e28714ea42ab6a3b1d0
---

7ce3b45fa4d78b07604dbfed2acb36013964b8b4