From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 19 Sep 2005 10:06:23 +0000 (+0000)
Subject: merge of 427cbc866d445c3f4a04da2bd34020543f1e5382
X-Git-Tag: Release-2010-05/1~9453^2~3490
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=502c3f77505fed246711e021e4d5e6a87b1e01c8;p=openembedded.git

merge of 427cbc866d445c3f4a04da2bd34020543f1e5382
     and 9081cef3c03d5ee66ba293e81a0ac15b88196e15
---

502c3f77505fed246711e021e4d5e6a87b1e01c8