From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 9 May 2006 21:24:52 +0000 (+0000)
Subject: merge of 7054d97385e70d2dc2f6a27205d99719a22abd1c
X-Git-Tag: Release-2010-05/1~9453^2~1732^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff126db34f8eb2e42291bb5552f86a8c2374a561;p=openembedded.git

merge of 7054d97385e70d2dc2f6a27205d99719a22abd1c
     and 7c2d7eb22952d356dfeb22359c91decfa90ab117
---

ff126db34f8eb2e42291bb5552f86a8c2374a561