From: Koen Kooi <koen@openembedded.org>
Date: Thu, 11 May 2006 17:23:36 +0000 (+0000)
Subject: merge of 66c62d7fb075e5d0b30f7334eb98a0c3515f163c
X-Git-Tag: Release-2010-05/1~9453^2~1716
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecba96371efd4dcfb197d60798ed8ffcc636cb87;p=openembedded.git

merge of 66c62d7fb075e5d0b30f7334eb98a0c3515f163c
     and 76e73da6705bd6599f3cb10085809f45b528bc8e
---

ecba96371efd4dcfb197d60798ed8ffcc636cb87