merge of 831dfac67d1a48d59ab2d08819eaa6c7a408902d
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 21 Oct 2005 20:49:59 +0000 (20:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Oct 2005 20:49:59 +0000 (20:49 +0000)
     and f9c285d9818e0742ed1724a0b77d7f7a51b378b6


Trivial merge