From: Erik Hovland <erik@hovland.org>
Date: Wed, 24 May 2006 18:56:25 +0000 (+0000)
Subject: merge of 2d6f8bd4b71a9ad4cd46736ff74dcf0bae763780
X-Git-Tag: Release-2010-05/1~9453^2~1624^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6db44b3bfd1f07a773ad03e28d6d4b88d0b0dfc2;p=openembedded.git

merge of 2d6f8bd4b71a9ad4cd46736ff74dcf0bae763780
     and 6d9a6d263913c8c725780872fe2f13329fcfb1b8
---

6db44b3bfd1f07a773ad03e28d6d4b88d0b0dfc2