merge of 297319220bbe0dfbc43d63ae1a0cdfed469df8aa
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 25 Aug 2005 15:02:33 +0000 (15:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 15:02:33 +0000 (15:02 +0000)
commit8f51654318b1181ffe2e6f0cde2ce7334297d119
tree50c051df0788773d763ecdd141fcb7e57126c48a
parent438e4e3b4e48c01d2fb4d9b8901c06ee30951a94
parent64054157ebfd2ed65e80c5d48cdf120405c2d86c
merge of 297319220bbe0dfbc43d63ae1a0cdfed469df8aa
     and dca4f1b7a000914caf1cdea0ed1b3898acf3e120