From: Koen Kooi <koen@openembedded.org>
Date: Sun, 23 Apr 2006 20:23:11 +0000 (+0000)
Subject: merge of 8681a1676985a0df1f06fc59cc7f50915300e156
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4cc7eafc92ae64a228279a251f042c2372c84f8;p=openembedded.git

merge of 8681a1676985a0df1f06fc59cc7f50915300e156
     and 86e9d63c930e7cda091f0ea8b0e2e7ee3dc1f93f
---

a4cc7eafc92ae64a228279a251f042c2372c84f8