merge of 8b01c8dc7fa2b317d2b847b773a4a60fb772c3c0
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 12 Jul 2005 14:31:22 +0000 (14:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Jul 2005 14:31:22 +0000 (14:31 +0000)
commit8160c902bf257fd426236dc3f38c2c0979439a43
treef83c8441a76120986eb7fb36b6cb76f5c6a4ad03
parent789c8956ec335b44148275ead0e8f0d7cd22b764
parentc212626683114f4928c533b22dd8e59b7c1b2998
merge of 8b01c8dc7fa2b317d2b847b773a4a60fb772c3c0
     and a042d7f2632d838665be9302bfa325e117606441