From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Mar 2008 23:18:23 +0000 (+0000)
Subject: merge of '8fdaa25fd43ec0cd83b190b8b345a620111e66b9'
X-Git-Tag: Release-2010-05/1~7501
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0519d4132b3c49a2ab877f335900db8e0ae00d2;p=openembedded.git

Merge ... '8fdaa25fd43ec0cd83b190b8b345a620111e66b9'
     and 'de7f15da3dcec92630db3a43f280fdfa55e08a88'
---

d0519d4132b3c49a2ab877f335900db8e0ae00d2