From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Dec 2005 12:33:07 +0000 (+0000)
Subject: merge of 93e812fbc937162b0851de128abef31f54210e80
X-Git-Tag: Release-2010-05/1~9453^2~2892
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ca3a36212c5d2d93dccbac63eee9c011192b421;p=openembedded.git

merge of 93e812fbc937162b0851de128abef31f54210e80
     and f4894fdd3104bff5cf149a07d1c3bcaa29c31e15
---

8ca3a36212c5d2d93dccbac63eee9c011192b421