merge of 80332541fe8af97cf6e4ae0388ba2b0f38b88605
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 12 Sep 2005 09:37:18 +0000 (09:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 09:37:18 +0000 (09:37 +0000)
commit380837491d26cdbdd3fe0bb646ec72126575651e
tree0cc963b55de5348b5811df92cd9eefe8f8c5a85a
parent5a6386c53a0e4752b3fa8fd29cf1a8653d9030c6
parent88e3667e366d184184913c9879e9834275c59ef3
merge of 80332541fe8af97cf6e4ae0388ba2b0f38b88605
     and 8886e2ff4b093b9718b9f8291827812566ffd11c