From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 10 Jan 2006 08:03:28 +0000 (+0000)
Subject: merge of 9258879eec9f4765e063760525cb63d32a681bc0
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c7707720a1ad9409d180a545d162ea8974ff950;p=openembedded.git

merge of 9258879eec9f4765e063760525cb63d32a681bc0
     and bb4ad068496963750f8030c0272eab6462a28b86
---

0c7707720a1ad9409d180a545d162ea8974ff950