merge of 514709e2adeba06a2b887310a65a6b3b440f6076
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Sep 2005 21:45:33 +0000 (21:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 21:45:33 +0000 (21:45 +0000)
commit07307be15183b31e81858870a4efde802c85f5f4
tree4f444fd8d39f86d735cd6b565b097d07eb17c3e5
parentd3fc3adfe82f006b9293c16fc2e6cc338e0b830c
parentab504559168aa9a772466af00f1c1dda0c70907f
merge of 514709e2adeba06a2b887310a65a6b3b440f6076
     and bfad0d650f31d9e9a3ce8fca87a95a84218252bf