merge of 53c5b2e873bb0b8ea06a56684f9d488fc043c3b2
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 14 Aug 2005 22:49:22 +0000 (22:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 22:49:22 +0000 (22:49 +0000)
     and e6e39921b062d03c77147b22e3d7394bdb39a97d


Trivial merge