From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 5 Aug 2005 23:30:40 +0000 (+0000)
Subject: merge of 90381a674a1aead7590d9fe88885d9a57dea4e9e
X-Git-Tag: Release-2010-05/1~9453^2~3954^2~13^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=016c7d781643000ba377b729ed058e10014f482c;p=openembedded.git

merge of 90381a674a1aead7590d9fe88885d9a57dea4e9e
     and d9996b78a73b41596bd40c745a5fb7f24bcd8695
---

016c7d781643000ba377b729ed058e10014f482c