merge of 039788d041fbc01b3a9b583c254eec64a5d3b578
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Jul 2006 11:20:33 +0000 (11:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 11:20:33 +0000 (11:20 +0000)
commit5e44cd573f6bab185debfd5afeeb3b7c1953767a
tree6eb13f9397c082ed49ad6e49b5fc0ae7488c3a0b
parent7879864edcda9b69f74d1ca461f54b630b42ee25
parent51657cd1b528d09a3d54d165ff57ed94a3d03097
merge of 039788d041fbc01b3a9b583c254eec64a5d3b578
     and 577114f4e4b115482dac5f45be9585d19cb94f37