merge of cc7e934c29b8aeafc9484a338f156f37cff26530
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 12 Mar 2006 21:06:25 +0000 (21:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Mar 2006 21:06:25 +0000 (21:06 +0000)
     and ee702fdf19b9ea88f67db2f6af59c0d51228ec91


Trivial merge