merge of 36bba38125b0902fe1eaddcaeaa996528cbb7364
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 29 Nov 2005 18:03:16 +0000 (18:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 29 Nov 2005 18:03:16 +0000 (18:03 +0000)
commit418712a6150eff75c557860538f605b2856f18c0
tree168b39a308af7d695fc93c6584927b551a302693
parent8700a39faa54abf5b564db7467a6b8d31ffca988
parent8dcc991799e17a3b06503c8f7e1f4173a05c23c0
merge of 36bba38125b0902fe1eaddcaeaa996528cbb7364
     and c125c8208cfb52ff3cc6e96a78bf4376459ea611