merge of 9258879eec9f4765e063760525cb63d32a681bc0
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 08:03:28 +0000 (08:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 08:03:28 +0000 (08:03 +0000)
commit0c7707720a1ad9409d180a545d162ea8974ff950
tree62516a38ae9556792a9a05bb8d5a7eee0c6fa2e8
parent29ef956e45a9ef8100cb581ed34b8d6a6f218308
parent2427fe5ac44f39555ca3b1fee8e0a234917cbe96
merge of 9258879eec9f4765e063760525cb63d32a681bc0
     and bb4ad068496963750f8030c0272eab6462a28b86