From: Matthias Hentges <oe@hentges.net>
Date: Wed, 20 Jun 2007 01:22:08 +0000 (+0000)
Subject: merge of '21c10a8f6d8fab5386df94e29b38d5428ca259bb'
X-Git-Tag: Release-2010-05/1~8868^2~302
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e5dde7be213d5b003de4f43bc936e6062eccb99;p=openembedded.git

Merge ... '21c10a8f6d8fab5386df94e29b38d5428ca259bb'
     and 'fa82b84114aa44a8ce522b1f4d5e6e017c7c38f4'
---

0e5dde7be213d5b003de4f43bc936e6062eccb99