merge of 3668ee2a346de324f1a080ffc39842da7fd5a787
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Mar 2006 17:53:33 +0000 (17:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Mar 2006 17:53:33 +0000 (17:53 +0000)
commit1a8da533cbc386c4d03339ed56ca66bafddc816f
tree2f289f4e49c968fb5670cb059e20581508bfbcb9
parent9bdc8f5fe8909e822bb1d185aa2de5f35b296e4a
parentb0d0f183d18a270845b2afcaf32a396a67777c2f
merge of 3668ee2a346de324f1a080ffc39842da7fd5a787
     and de8c26e5b67b458b3707756fe2ac783f52b889b3