merge of 253b3416d6485c95aa1653ae4d5b49a707d9fbe6
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 5 Feb 2006 01:01:54 +0000 (01:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 01:01:54 +0000 (01:01 +0000)
     and 9b98e6390444bf96f5e5fa74d89ff83c0083a833


Trivial merge