From: Koen Kooi <koen@openembedded.org>
Date: Mon, 15 May 2006 12:57:35 +0000 (+0000)
Subject: merge of 83195d46f6bf1906b76383eda46dabd7b3f07787
X-Git-Tag: Release-2010-05/1~9453^2~1696^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0560c720075ba3fd361b91e1599ea82c93929ec9;p=openembedded.git

merge of 83195d46f6bf1906b76383eda46dabd7b3f07787
     and e6e29b77562355b1ab3fd88dcc282b3158ae5966
---

0560c720075ba3fd361b91e1599ea82c93929ec9