From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Mar 2006 16:11:39 +0000 (+0000)
Subject: merge of 7d24213f70bee7eac546332151b9d70410532933
X-Git-Tag: Release-2010-05/1~9453^2~2294
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06310a2da47fb0468145600b53b0c333f96bd563;p=openembedded.git

merge of 7d24213f70bee7eac546332151b9d70410532933
     and b7901ea9b8f4b39e360431eed3b70ca36c35435a
---

06310a2da47fb0468145600b53b0c333f96bd563