From: Erik Hovland <erik@hovland.org>
Date: Mon, 8 May 2006 19:19:53 +0000 (+0000)
Subject: merge of 59f97700899a07187b176ccd4ee9885184f096ae
X-Git-Tag: Release-2010-05/1~9453^2~1624^2~1^2~2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ceb9beb6476d646012e9ba52f2a67eb0038f90ae;p=openembedded.git

merge of 59f97700899a07187b176ccd4ee9885184f096ae
     and b1db4ad66d7affe171f6be3fc1e203540febb857
---

ceb9beb6476d646012e9ba52f2a67eb0038f90ae