From: John Bowler <jbowler@nslu2-linux.org>
Date: Sat, 30 Jul 2005 20:46:24 +0000 (+0000)
Subject: merge of d5c1c82a4f4d4259c9ae9a22865774bf9df663ca
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~18^2~8^2~1^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92c083d055ae8f958ae2ad79cb1f9751e697bb47;p=openembedded.git

merge of d5c1c82a4f4d4259c9ae9a22865774bf9df663ca
     and e8a8ea202059d2f8a7a8f6d316818ee71b449d4a
---

92c083d055ae8f958ae2ad79cb1f9751e697bb47