From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jan 2008 17:26:49 +0000 (+0000)
Subject: merge of '5b5a99c95ab4ee23e5e5c0460ba6744420c75edb'
X-Git-Tag: Release-2010-05/1~7838^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89230c2835a3b2d8956ae583cc15336ad3db9b2a;p=openembedded.git

Merge ... '5b5a99c95ab4ee23e5e5c0460ba6744420c75edb'
     and '84d6e8f79077a6afd15b7c4d1b4260dba2fc07e6'
---

89230c2835a3b2d8956ae583cc15336ad3db9b2a