From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Jul 2005 21:41:31 +0000 (+0000)
Subject: merge of 15e035df7fe4e06f903b284d02d9093184c03e78
X-Git-Tag: Release-2010-05/1~9453^2~4092^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f98a7c864e7637132fb52acb596d667bc77384ea;p=openembedded.git

merge of 15e035df7fe4e06f903b284d02d9093184c03e78
     and 1fac386ef241a1a19317045e669c3c4d038c2996
---

f98a7c864e7637132fb52acb596d667bc77384ea