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

merge of 406934f50b9f92db47af1cb9d9777b268c5484b5
     and 6ba2bb7b7ce5ef334cf514386df28b8d6a2aad86
---

7ed412e1e868f20a0e803e91e3d7e3529f61b44e