merge of d3538e5f45f69d0b65a1d425359ba88009d3ef91
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 14 Jan 2006 08:45:40 +0000 (08:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 08:45:40 +0000 (08:45 +0000)
     and e7693771f829a9afffa119fcdc723d562cbb94fa


Trivial merge