merge of 46e0039f24ae8a639a638dadeb0b8e88e8fb48b0
authorKoen Kooi <koen@openembedded.org>
Tue, 23 Aug 2005 10:39:17 +0000 (10:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Aug 2005 10:39:17 +0000 (10:39 +0000)
commit03b1a859b30576803a7be64d906537cc14055596
treeea0c5ffa2078986004cb6350a386f1633bca421b
parent2348c858925818d2f2b01a20bbda40a73e4eba88
parent2d0fea9d7485fbbfd051b18f535580307e615f42
merge of 46e0039f24ae8a639a638dadeb0b8e88e8fb48b0
     and 7e0579c485fc3de6e06a10b9db460e3ba59cd9e5