merge of 3d36999259540aad0864e3018cb37560232cbb86
authorKoen Kooi <koen@openembedded.org>
Fri, 9 Dec 2005 10:40:03 +0000 (10:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Dec 2005 10:40:03 +0000 (10:40 +0000)
commite8e3bcf57fe894ffe203127fcaa95e5b50f10dc1
tree2ac0a529ee16f78447bf87af7360f71efe8f692e
parent56c376c1937ad4f9d4c380523a6358c5a884fcd9
parent4955af976909a19c43dfa16e8ad63425bacb0992
merge of 3d36999259540aad0864e3018cb37560232cbb86
     and d4be44886b4f04bdee851d4031e18277d8439775