merge of 1b601f0ec6ab29681a14be2f437f3ea7d01e877b
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 09:38:55 +0000 (09:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 09:38:55 +0000 (09:38 +0000)
commit186d49918d5509362f67de9b53cf69075ab342fb
treeb28db84cf29327afe181a14981e5275e371d74a9
parent6b501293bb154835aaebfbc39f1115929253a8d8
parentdbb8037b26b34df48e7799908a2a47c6cd6e4e8a
merge of 1b601f0ec6ab29681a14be2f437f3ea7d01e877b
     and fe9ab59624a3c03737b56db99eaa945b890ddc8a