From: Koen Kooi <koen@openembedded.org>
Date: Sun, 6 Nov 2005 10:06:37 +0000 (+0000)
Subject: merge of 0e4a1c08bfbbaefe2b813f4ba08b4c186b04a484
X-Git-Tag: Release-2010-05/1~9453^2~3136
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=413b4d7adf6863ad55bbb43cd714cf3c60c7c3e2;p=openembedded.git

merge of 0e4a1c08bfbbaefe2b813f4ba08b4c186b04a484
     and 21d66a92293faf76a506c7d17e3cd16e143bb401
---

413b4d7adf6863ad55bbb43cd714cf3c60c7c3e2