From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Feb 2006 22:23:36 +0000 (+0000)
Subject: merge of 4b06abdf57f4120c272429171977e1efd7378926
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99407a381ae2104f665455e5e1d2ec1789a885f6;p=openembedded.git

merge of 4b06abdf57f4120c272429171977e1efd7378926
     and 8fb0e135d3da67bc1fa37bd6ad67902d8cf02bcb
---

99407a381ae2104f665455e5e1d2ec1789a885f6