From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 4 Sep 2005 23:18:39 +0000 (+0000)
Subject: merge of 9603f6005b15a0057063cac02eda02f14cb2e651
X-Git-Tag: Release-2010-05/1~9453^2~3649
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56123c75fc34d787e8a2cfbd6c0ec6d4e45a3538;p=openembedded.git

merge of 9603f6005b15a0057063cac02eda02f14cb2e651
     and 913ad257363032feeb27b024f8bb727bce13dea7
---

56123c75fc34d787e8a2cfbd6c0ec6d4e45a3538