From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 30 Jan 2008 09:17:50 +0000 (+0000)
Subject: merge of '69accd77bc1602a9ed5957e6db7754b669a5e8ea'
X-Git-Tag: Release-2010-05/1~7798
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a87a2ebb1845dc818a46b80054bcb0370450ae41;p=openembedded.git

Merge ... '69accd77bc1602a9ed5957e6db7754b669a5e8ea'
     and '77255eff938f77a73e2bcaf9e08a9568e2c88208'
---

a87a2ebb1845dc818a46b80054bcb0370450ae41