From: Koen Kooi <koen@openembedded.org>
Date: Thu, 2 Aug 2007 15:49:42 +0000 (+0000)
Subject: merge of '16b2b0213ee4ffed03286c1d3a6c02a47de6cbac'
X-Git-Tag: Release-2010-05/1~8868^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ff03b934dd0e9649a49002b7a0a4258322722b6;p=openembedded.git

Merge ... '16b2b0213ee4ffed03286c1d3a6c02a47de6cbac'
     and '4f147d2d94a319ec848b2853d52d9065acfa63d5'
---

9ff03b934dd0e9649a49002b7a0a4258322722b6