merge of 208f8ee44bce20b98a8ef3a6adc63102d293000e
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 22 Jan 2006 16:51:37 +0000 (16:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 16:51:37 +0000 (16:51 +0000)
     and a51640b1884b40ac00b2e319003ae45c51e828fd


Trivial merge