From: Koen Kooi <koen@openembedded.org>
Date: Mon, 20 Feb 2006 12:51:03 +0000 (+0000)
Subject: merge of 3abff1bf232495168a2b305065a4da2954e5a9db
X-Git-Tag: Release-2010-05/1~9453^2~2309
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7627229878da162e51c3a3b584124ac8c5603b86;p=openembedded.git

merge of 3abff1bf232495168a2b305065a4da2954e5a9db
     and 7130132bd2ec2d091cb9f34a849614afc5cca66a
---

7627229878da162e51c3a3b584124ac8c5603b86