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

merge of 134275ac8282e85c0c6a9e535657f513f7f039c0
     and 9afd2dba8f4f062cb27df95849c47aa62f3441dc
---

cf317a56b63391420dd5519b8774f7415c872002