merge of 56ee470fc65db2cddfbe809ef76746929e1cc7a1
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 27 May 2006 18:23:07 +0000 (18:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 18:23:07 +0000 (18:23 +0000)
     and cd5dfac4524135d71f6f42fb7d1288b700ec5d38


Trivial merge