From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 4 Feb 2006 16:21:52 +0000 (+0000)
Subject: merge of 7740b6ed65b5143742452d7e176244424dd90f02
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5^2~4^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38ad5b8d92ad0d03d92e44d63ac05b7ceeee1078;p=openembedded.git

merge of 7740b6ed65b5143742452d7e176244424dd90f02
     and 8b63d51862e914db45c25ecc48e39ba5d90699e8
---

38ad5b8d92ad0d03d92e44d63ac05b7ceeee1078