From: Koen Kooi <koen@openembedded.org>
Date: Tue, 29 Aug 2006 09:07:57 +0000 (+0000)
Subject: merge of '5aa5d42f826b82e5dcae45d30186d8ec6fc7f784'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~24^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fec9cdb0716b0a6aac9a4fa806bc5277df5b01b;p=openembedded.git

Merge ... '5aa5d42f826b82e5dcae45d30186d8ec6fc7f784'
     and 'c0aaf39c5aa5cccb43a4e2e31affbf6f06a62c4a'
---

0fec9cdb0716b0a6aac9a4fa806bc5277df5b01b