From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 19 Aug 2007 12:39:46 +0000 (+0000)
Subject: merge of '1f413a8fc168cbef64fe984af210e9d998cc3382'
X-Git-Tag: Release-2010-05/1~8900
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18215b5eb4195eccf9b8257805948aa9a9344c96;p=openembedded.git

Merge ... '1f413a8fc168cbef64fe984af210e9d998cc3382'
     and '29d2dfa77e02cc2f8721d7954eb27c061486b2f4'
---

18215b5eb4195eccf9b8257805948aa9a9344c96