From: Koen Kooi <koen@openembedded.org>
Date: Fri, 2 Mar 2007 16:42:24 +0000 (+0000)
Subject: merge of '21f4ee6d8fb062180d2dc43b1e650ead520ca0a9'
X-Git-Tag: Release-2010-05/1~9113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5988324f397a072f6feec886a803178da822e3f9;p=openembedded.git

Merge ... '21f4ee6d8fb062180d2dc43b1e650ead520ca0a9'
     and '449ea8e45f6398be01dd6f681846b2c1f8a10c67'
---

5988324f397a072f6feec886a803178da822e3f9