From: Koen Kooi <koen@openembedded.org>
Date: Thu, 3 Nov 2005 18:57:44 +0000 (+0000)
Subject: merge of 4741ce472626483ef14f4a9e8706f74f696beea4
X-Git-Tag: Release-2010-05/1~9453^2~3147
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f5c7dc29dd345efc3f224acf5616c9ca598284;p=openembedded.git

merge of 4741ce472626483ef14f4a9e8706f74f696beea4
     and 9864f624e216fb40fafd7e08d11393c5847d037c
---

13f5c7dc29dd345efc3f224acf5616c9ca598284