From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 4 Apr 2006 09:27:59 +0000 (+0000)
Subject: merge of 85a1c1efe7466253130cd2e2a63079154ba54454
X-Git-Tag: Release-2010-05/1~9453^2~2110
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=414a70ace8cf06857958fad7f87cfcb63b350072;p=openembedded.git

merge of 85a1c1efe7466253130cd2e2a63079154ba54454
     and c67d38b84a548cc9efa81f9371658f5c59e87e43
---

414a70ace8cf06857958fad7f87cfcb63b350072