From: Koen Kooi <koen@openembedded.org>
Date: Thu, 1 Dec 2005 15:05:21 +0000 (+0000)
Subject: merge of 47d86e9a403d6513783b2b5fafbc7e4d0873f343
X-Git-Tag: Release-2010-05/1~9453^2~2988^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=462885aa9e50570c7b42a222b509662a2c6bba68;p=openembedded.git

merge of 47d86e9a403d6513783b2b5fafbc7e4d0873f343
     and 7ee5c62fc6fea21a0758652386c98049c72dce66
---

462885aa9e50570c7b42a222b509662a2c6bba68