merge of 17cd385f326ee735c89b1dc43f11761e2f1a41f2
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 31 Jul 2005 14:36:14 +0000 (14:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 14:36:14 +0000 (14:36 +0000)
     and 81b6d1dfdca16a87ee13d9c5e11b5d9945ffcb99


Trivial merge