merge of 9e933b0af0fc064b5d0c5706a3ed1459685dc82e
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 16 Jan 2006 19:15:09 +0000 (19:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 19:15:09 +0000 (19:15 +0000)
commitdf6d761b3ad923685bd61a9f04a111744a1d6ca2
tree69bc1613c3b9bb7701937bc4fc39940423f0c62c
parent6b7008c5b34759de3390841d8e9ff675e8350822
parent5296d0212e55e49fd0afce08751c54b5057a84fa
merge of 9e933b0af0fc064b5d0c5706a3ed1459685dc82e
     and b34de7d4aba1b19d8802068ebd9f1d15bc5d4da5