merge of 143171ba4cb95821314675d1cb46491353e62030
authorKoen Kooi <koen@openembedded.org>
Mon, 20 Feb 2006 12:55:23 +0000 (12:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 12:55:23 +0000 (12:55 +0000)
commit047fecc9b152bd5774e8d54094d786650dc0d679
treeb0190fe2b9a2a05c68d64e44895e8193d822dcdb
parent7627229878da162e51c3a3b584124ac8c5603b86
parent565cf062abec9a3725f9bb69fb0741ca6fc17ffc
merge of 143171ba4cb95821314675d1cb46491353e62030
     and 5940fb0f49cdfe1680ae936ca512594587c56b1d