From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 Jul 2005 22:59:16 +0000 (+0000)
Subject: merge of 002a1f51b953da649d96ae8ecdac59ea1ae42bd5
X-Git-Tag: Release-2010-05/1~9453^2~4129^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=310d8edbb3d8142c2e24c71097652d2f02792219;p=openembedded.git

merge of 002a1f51b953da649d96ae8ecdac59ea1ae42bd5
     and e109156250767b8fafcee6f70ed990161ec858d1
---

310d8edbb3d8142c2e24c71097652d2f02792219