From: Koen Kooi <koen@openembedded.org>
Date: Mon, 5 Sep 2005 18:22:38 +0000 (+0000)
Subject: merge of 1ba5e5da6f959068ba57d3ec6046c21ca621cd8c
X-Git-Tag: Release-2010-05/1~9453^2~3636
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54d81f8399200687d5f6d7dafa5cace76da00680;p=openembedded.git

merge of 1ba5e5da6f959068ba57d3ec6046c21ca621cd8c
     and 21490fb90785cccbb3926c5fc9a7adf67d89e0b0
---

54d81f8399200687d5f6d7dafa5cace76da00680