From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 10 Jan 2006 09:38:55 +0000 (+0000)
Subject: merge of 1b601f0ec6ab29681a14be2f437f3ea7d01e877b
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=186d49918d5509362f67de9b53cf69075ab342fb;p=openembedded.git

merge of 1b601f0ec6ab29681a14be2f437f3ea7d01e877b
     and fe9ab59624a3c03737b56db99eaa945b890ddc8a
---

186d49918d5509362f67de9b53cf69075ab342fb