From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 14 Jan 2008 14:06:24 +0000 (+0000)
Subject: merge of '6104c95bf5e75fc92d17f6e04a7c37a6efbb147f'
X-Git-Tag: Release-2010-05/1~7928
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef9bb6be18022cc530a4a11200c0221ebe69f4e2;p=openembedded.git

Merge ... '6104c95bf5e75fc92d17f6e04a7c37a6efbb147f'
     and 'f7a565e7e910cea46808ec61590556a6b97dff74'
---

ef9bb6be18022cc530a4a11200c0221ebe69f4e2