From: Koen Kooi <koen@openembedded.org>
Date: Mon, 6 Feb 2006 09:02:33 +0000 (+0000)
Subject: merge of 0dcf135f8174d6cb8b709f2104158f5de5fa769d
X-Git-Tag: Release-2010-05/1~9453^2~2429^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d84f45ff8f5a03695c1cd0e1dac0d1d3390b96;p=openembedded.git

merge of 0dcf135f8174d6cb8b709f2104158f5de5fa769d
     and 6e0b7038969c91f76744d47455957a8284414e7d
---

23d84f45ff8f5a03695c1cd0e1dac0d1d3390b96