From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 30 Jul 2005 14:22:50 +0000 (+0000)
Subject: merge of 09627713f8e42fa38928ab18579f8b439551a6a6
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~31^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21144d81926d426df3e4bfa86de1ae9d1231a535;p=openembedded.git

merge of 09627713f8e42fa38928ab18579f8b439551a6a6
     and 1281bf8b46b175630b1cf44e40c66e27a43a71cc
---

21144d81926d426df3e4bfa86de1ae9d1231a535