From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 20 Aug 2007 13:23:03 +0000 (+0000)
Subject: merge of '384c03fc9086edbfe62961d2a403edd22aa3e820'
X-Git-Tag: Release-2010-05/1~8883^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccb0fa55ca46cc3f1c7269e424dad1f9a94c2ac9;p=openembedded.git

Merge ... '384c03fc9086edbfe62961d2a403edd22aa3e820'
     and 'f5ea07728cfa7bdf07cae1c5d718a57488f84b6e'
---

ccb0fa55ca46cc3f1c7269e424dad1f9a94c2ac9