merge of 7241b1d9470fba9a059677122babf829bc53e3d6
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 30 Aug 2005 21:12:08 +0000 (21:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 21:12:08 +0000 (21:12 +0000)
     and 8fc2532eab5aa18bfb78e2d7db01f371bf7f1383


Trivial merge