From: Koen Kooi <koen@openembedded.org>
Date: Mon, 20 Feb 2006 12:55:23 +0000 (+0000)
Subject: merge of 143171ba4cb95821314675d1cb46491353e62030
X-Git-Tag: Release-2010-05/1~9453^2~2308
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=047fecc9b152bd5774e8d54094d786650dc0d679;p=openembedded.git

merge of 143171ba4cb95821314675d1cb46491353e62030
     and 5940fb0f49cdfe1680ae936ca512594587c56b1d
---

047fecc9b152bd5774e8d54094d786650dc0d679