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)
commit3161ca09f01c8543b6b97183989be96d00ffb62f
treed96fe51aaa9f308f1b078a60156515e52c7010ff
parentc37a09b1d30f8dd5c36749c4e7ee6faf1f043ed1
parentefb60eda6686e668e7563d7ab3bea735d671c549
merge of 53c5b2e873bb0b8ea06a56684f9d488fc043c3b2
     and e6e39921b062d03c77147b22e3d7394bdb39a97d