merge of 9a11de92d9c3eed4c359dd682b59ad9fa1269059
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 6 Jul 2005 00:29:05 +0000 (00:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 6 Jul 2005 00:29:05 +0000 (00:29 +0000)
     and c7189342ca7601a9bcc0fc14fb902f0adac7b0f7


Trivial merge