From: Erik Hovland <erik@hovland.org>
Date: Thu, 25 May 2006 17:58:55 +0000 (+0000)
Subject: merge of 311aee6b0e9c7e9db57f288fca6db1879c2922e8
X-Git-Tag: Release-2010-05/1~9453^2~1624
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86c7a226dcf5dbd77f68509c625f8cd78a89e17c;p=openembedded.git

merge of 311aee6b0e9c7e9db57f288fca6db1879c2922e8
     and a7eb3356e7d55322be61cd06888673575122e3b9
---

86c7a226dcf5dbd77f68509c625f8cd78a89e17c