From: Koen Kooi <koen@openembedded.org>
Date: Mon, 28 Nov 2005 21:17:46 +0000 (+0000)
Subject: merge of 6167902f8756810f12305f33e05925c1b2811f0c
X-Git-Tag: Release-2010-05/1~9453^2~3002^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71606ab7069b27f2224efb6f682beaf4846e4aa1;p=openembedded.git

merge of 6167902f8756810f12305f33e05925c1b2811f0c
     and e57b306d5d33aa84cfa65719890862b92749d01a
---

71606ab7069b27f2224efb6f682beaf4846e4aa1