merge of 079915a55f24902d8284c03a7b3adbdacae9275a
authorKoen Kooi <koen@openembedded.org>
Thu, 28 Jul 2005 14:18:21 +0000 (14:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:18:21 +0000 (14:18 +0000)
commit523565c483a854757fca191a6bee00b7a2241510
treeb1362f637504407724642a9f70355e7f67c487a1
parent51e73263221b22ddf7c47fde1e731bc26fe388f9
parentf3a58bb241a3259d9bd0131f96435c85c40686d0
merge of 079915a55f24902d8284c03a7b3adbdacae9275a
     and e91215dbe7d81225280dbae31ec4d29630f67f58