merge of 035c277be666bb4820b89ac86d5503b539c1d665
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 09:40:17 +0000 (09:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 09:40:17 +0000 (09:40 +0000)
commit1905138fc23ebb7557d28e6b47d9a25488b645b9
treeaee1a677b97ae9b7476bc6eee9963de43ba3de20
parente825622c7f87f90cdcf759ccfeec5f357ae3793a
parent186d49918d5509362f67de9b53cf69075ab342fb
merge of 035c277be666bb4820b89ac86d5503b539c1d665
     and eb6163e5b086184e50d3ecd9d48fccd8593c4827