merge of 0a900d63608cab0110252c20c271767fbdb6a129
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Sep 2005 11:08:53 +0000 (11:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 11:08:53 +0000 (11:08 +0000)
commit5669ffe8ec893e44821c048db83c9180c8a8e7f1
tree15902a955b7c8a8e13210f6840bfd69410ba5d5c
parent23430ca54377133de1107c3cec6d4d063388cc03
parent1454dd63e49b454d5106c5ea86e23bf17a1d6500
merge of 0a900d63608cab0110252c20c271767fbdb6a129
     and 517a459ec3a1489d819b662a44e51bffd5943300