From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Sep 2006 11:23:01 +0000 (+0000)
Subject: merge of '33a35e22030bcab7919a207fd07515e79928efab'
X-Git-Tag: Release-2010-05/1~9453^2~808
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a86ec0f346b23387cc6e343020b90e7a57d6bfcb;p=openembedded.git

Merge ... '33a35e22030bcab7919a207fd07515e79928efab'
     and '647f04c8db2652dabb7190fe050d069434a1de3a'
---

a86ec0f346b23387cc6e343020b90e7a57d6bfcb