explicit_merge of f4993582a6bc13487c991548a98342ea6d084c2a
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 3 Aug 2005 21:07:05 +0000 (21:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 21:07:05 +0000 (21:07 +0000)
              and 7dcc40f11838a5d4253110fb45d10c0cd109a0ff
   using ancestor 6c249e86f20cab16da75a620e43f22520d6b1f7b
        to branch 'org.openembedded.nslu2-linux'


Trivial merge