merge of 39a77001ea8e83e4668aac829096b729bcc93056
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 5 Dec 2005 18:24:28 +0000 (18:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 18:24:28 +0000 (18:24 +0000)
commit669b4130054a6aac682e13f9f90ec90196642c37
tree49cb2270e4fd0e6c76788976cf8d2fbbfe1f99c1
parent0dce78f68905d9acdb94b7a54e199cf8a261fe28
parent2b1a9b11bfdfae3518f7a91936a60b7d8f69e114
merge of 39a77001ea8e83e4668aac829096b729bcc93056
     and 5b5b8b71487defdcc39752dd5f29638b15be8a3d