merge of 7961785499462b0a3444277448e496a1efd6deda
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 24 Oct 2005 18:58:37 +0000 (18:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Oct 2005 18:58:37 +0000 (18:58 +0000)
     and f0e6ce1b155a55c7168f73ae67524b654d95aa8b


Trivial merge