From: Koen Kooi <koen@openembedded.org>
Date: Mon, 28 Nov 2005 21:15:25 +0000 (+0000)
Subject: merge of 264f8902da57233dad1ce1345495ca9e2fa6e2d4
X-Git-Tag: Release-2010-05/1~9453^2~3002^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a519521113c10547d2135c06ad95450c72689bd;p=openembedded.git

merge of 264f8902da57233dad1ce1345495ca9e2fa6e2d4
     and 6db5a6f376383e2d73ef38fa86ae25d51699b983
---

4a519521113c10547d2135c06ad95450c72689bd