From: Koen Kooi <koen@openembedded.org>
Date: Tue, 21 Nov 2006 19:26:03 +0000 (+0000)
Subject: merge of '4ddff6248143a48297190b36c8ec6148bc9301bb'
X-Git-Tag: Release-2010-05/1~9453^2~347
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d407f7c94e04244dd15c649ddc8f70fc1cd93e5d;p=openembedded.git

Merge ... '4ddff6248143a48297190b36c8ec6148bc9301bb'
     and '596c72f81f8ea7f3dc414c89f83ba978e7c935dd'
---

d407f7c94e04244dd15c649ddc8f70fc1cd93e5d