merge of 2786b01c941e932325ebd3fc61a3a60664dc3b48
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 3 Oct 2005 22:09:41 +0000 (22:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Oct 2005 22:09:41 +0000 (22:09 +0000)
commit06c5c42e2da68e95c6cdf39606150865e36b1f71
tree00dd72a25f7f589d9ff0aca0f9404c54dae71374
parent8fa2c7ab4cc24fa723885661fa5be14c48b363ea
parent6b5075fa761e23d7e4e6550dcbcf3eb5fafdf7d2
merge of 2786b01c941e932325ebd3fc61a3a60664dc3b48
     and 29da97548b6f79e801e68f41b3a37862a7577bfa