merge of 46041f133cbc74bb45da74974398099f4df06233
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 14 Jan 2006 04:20:47 +0000 (04:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 04:20:47 +0000 (04:20 +0000)
     and 517eb93612fa6b35cf1845bfd8894d2b35a4772f


Trivial merge