From: Koen Kooi <koen@openembedded.org>
Date: Fri, 22 Jul 2005 16:00:20 +0000 (+0000)
Subject: merge of 4339c862c7e6e4f616af262e7f1adc11bcbd4f67
X-Git-Tag: Release-2010-05/1~9453^2~4086^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5c44512f1691fe9a7df3715d741ce00d42a66be;p=openembedded.git

merge of 4339c862c7e6e4f616af262e7f1adc11bcbd4f67
     and 91669c817133defa72ee377e661993b9a4e812c4
---

c5c44512f1691fe9a7df3715d741ce00d42a66be