From: Koen Kooi <koen@openembedded.org>
Date: Sun, 24 Jul 2005 17:10:22 +0000 (+0000)
Subject: merge of 659f1b6f8d68752f4656f3cbc2491ec0fed162d2
X-Git-Tag: Release-2010-05/1~9453^2~4071
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa97a6aa76b9fd37281fd36f4bc4bdd04e8d9698;p=openembedded.git

merge of 659f1b6f8d68752f4656f3cbc2491ec0fed162d2
     and 7ca35ae8ca6e236e331175d9f5164f0a0f663f57
---

fa97a6aa76b9fd37281fd36f4bc4bdd04e8d9698