merge of 3bce23b65aa15f7e7004b8d10ea82415547c11d6
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 15:16:21 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 15:16:21 +0000 (15:16 +0000)
commitc694c15b154f19c043c262af1ba864817a53a40c
treee979c7bd3b76435a31b4173900a8ce95485dcba7
parent4d10be8ca4cbbebf2b74447e8d8ab45e7ef9b714
parent7251167ee9a15f675f7bacf61f0dbd5b5863c012
merge of 3bce23b65aa15f7e7004b8d10ea82415547c11d6
     and 79101cb27f895ead25974ab455fb7cbbcb030caa