merge of 0f708a1a283427a436a4dde390b7d5fdc54f35e6
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 31 Jul 2005 23:23:58 +0000 (23:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 23:23:58 +0000 (23:23 +0000)
commit54493d24f6693389e728961d567cebfe69c9bc35
tree479df95459c8909b0cbf62732d4db81b26b6d513
parent5e7b45ce3e6e868dce29dd2c7224aea12a13ef8c
parentacfbd5a1e9958638052a08ac1673ee1dd776fed0
merge of 0f708a1a283427a436a4dde390b7d5fdc54f35e6
     and b1872f89ec8b07b1e4d80e4ed9e0b397da5f4f3a