From: Koen Kooi <koen@openembedded.org>
Date: Fri, 24 Mar 2006 12:48:24 +0000 (+0000)
Subject: merge of 178f3f0b13daf4d30ab59b4d784ffc9784e60fe3
X-Git-Tag: Release-2010-05/1~9453^2~2121
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f931454814a9bed2877a321d54726d5900a5a05;p=openembedded.git

merge of 178f3f0b13daf4d30ab59b4d784ffc9784e60fe3
     and ac0da6aa2f71fa6df7ee8952103394d2b4b012ab
---

9f931454814a9bed2877a321d54726d5900a5a05