From: Koen Kooi <koen@openembedded.org>
Date: Wed, 13 Jun 2007 08:34:04 +0000 (+0000)
Subject: merge of '752a299fb6dac3f47f04ff23bc60eb3cbf0fcc44'
X-Git-Tag: Release-2010-05/1~8868^2~393^2~3^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26eeb940ac198c37fa32fe98edadbeca15e8be6b;p=openembedded.git

Merge ... '752a299fb6dac3f47f04ff23bc60eb3cbf0fcc44'
     and '8119e9385c70c493e4f797e81537765d2dd31127'
---

26eeb940ac198c37fa32fe98edadbeca15e8be6b