merge of 09f9e22a8b02fd6a41aa1d5a558f5ba97103e99a
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 24 Jan 2006 19:48:31 +0000 (19:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jan 2006 19:48:31 +0000 (19:48 +0000)
     and fde5d898c22b8382518f54905b699a11addbc8a3


Trivial merge