merge of 100af48176006080bc6eaf59f5e30c1da29c86c3
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 31 Jul 2005 14:27:01 +0000 (14:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 14:27:01 +0000 (14:27 +0000)
commita52282efd0d8ae7cfc33824301afc80af9ba1c22
treec92881f10f228bb829c7df25abe27bbc5d5e3cfc
parent0246ee976adbdfbcd7509ae9f0f4dd92d0128a7f
parent83fe3621cd87216dce4fefd8828807096a548fa7
merge of 100af48176006080bc6eaf59f5e30c1da29c86c3
     and 17e420c5e347fcd369eb9354898c3e5ef2d059c6