merge of 856181643b2a33fbd80da145f003dc111c407d9e
authorKoen Kooi <koen@openembedded.org>
Sat, 23 Jul 2005 00:08:12 +0000 (00:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 00:08:12 +0000 (00:08 +0000)
commit6f04daf899c1100d9bb9c14cf6ccbd3fcea5b4a6
tree7e699d5bbe72bfa3e914b642fec4a04383654c59
parent15f252db09fd7e5956a5ca6ff32145acc6490c9d
parent0c3ba72a4610f654144536314b9360f2ee4b07cf
merge of 856181643b2a33fbd80da145f003dc111c407d9e
     and a09cb27506f56d7b4d048f4d60c7df2e11968692