merge of 46041f133cbc74bb45da74974398099f4df06233
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 14 Jan 2006 04:20:47 +0000 (04:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 04:20:47 +0000 (04:20 +0000)
commit23d4b048f42531eee488f8ddf510371c9eaa0e0c
treee1743d89d2f87892aca7c966f0ca36fc9d5dfaf5
parent5a048cc09baf8498736e25699ca85b3c69a01adb
parent9275a51232f4eab2aa73d4698e7676f95309c60e
merge of 46041f133cbc74bb45da74974398099f4df06233
     and 517eb93612fa6b35cf1845bfd8894d2b35a4772f