From: Koen Kooi <koen@openembedded.org>
Date: Fri, 2 Dec 2005 17:37:16 +0000 (+0000)
Subject: merge of 7d1c333a7a53d6a178e09f1c4d8fc0ea9d243f7b
X-Git-Tag: Release-2010-05/1~9453^2~2985
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e279d73e06478c9f5bc1ef2e22e8bc3c047779ec;p=openembedded.git

merge of 7d1c333a7a53d6a178e09f1c4d8fc0ea9d243f7b
     and ee7a6ae9f04d3b86e0a6b611e45b6380c8c337b2
---

e279d73e06478c9f5bc1ef2e22e8bc3c047779ec