merge of 45134ada52bf69aa376e98002657a0c130e6ff44
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 9 Jan 2006 19:23:03 +0000 (19:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jan 2006 19:23:03 +0000 (19:23 +0000)
commit1bcc930ec17ed96e7c55aa925af6dfa367ebc2c0
tree06d207d49c14b72a1183891f9766b381403bf46f
parent86d1d8cd13335c4dca722ac398c69a105fc9ac8f
parenta0bc3b7972aafc38c3bfb3045896c01c5ae05e8d
merge of 45134ada52bf69aa376e98002657a0c130e6ff44
     and 77ee5dc366bb987ffa1f3267250d243a17292002