From: Koen Kooi <koen@openembedded.org>
Date: Sat, 27 May 2006 14:12:44 +0000 (+0000)
Subject: merge of 126ec62999c60bc43412b0635388956112083a61
X-Git-Tag: Release-2010-05/1~9453^2~1587
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb7b68985df5eda0262a53f81193e1601e85d268;p=openembedded.git

merge of 126ec62999c60bc43412b0635388956112083a61
     and aedc32759fe92452f07cd25211ccc84ba92028ac
---

cb7b68985df5eda0262a53f81193e1601e85d268