From: Koen Kooi <koen@openembedded.org>
Date: Mon, 5 Jun 2006 16:41:53 +0000 (+0000)
Subject: merge of 063a83fd9a6c656a5d54258b7c3e437e159f7302
X-Git-Tag: Release-2010-05/1~9453^2~1419^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeba6e600acc9f4187b395e2fcbcbc77387947d3;p=openembedded.git

merge of 063a83fd9a6c656a5d54258b7c3e437e159f7302
     and e754f038eb03281981bba6e48f154314cd9f8a79
---

aeba6e600acc9f4187b395e2fcbcbc77387947d3