From: Koen Kooi <koen@openembedded.org>
Date: Tue, 3 Oct 2006 21:04:39 +0000 (+0000)
Subject: merge of '10d887a6bc65bb22550e2964935e1dea718ab462'
X-Git-Tag: Release-2010-05/1~9453^2~629
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41e110b86d7ece85d33014be4e689d41882b3f76;p=openembedded.git

Merge ... '10d887a6bc65bb22550e2964935e1dea718ab462'
     and '5a0ba6276c9c5a55e17b2681a1d2220b37d09582'
---

41e110b86d7ece85d33014be4e689d41882b3f76