merge of '9d487e0e820ff337d6de3af6ade625bea99a13f0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 30 Oct 2007 18:45:18 +0000 (18:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 30 Oct 2007 18:45:18 +0000 (18:45 +0000)
commit705363284fd907087a0a4ca02f323971950422e0
tree8404b34b5f07c3fd325aa6c1a156f715e608d998
parent767c48edffe2b87c6bba03638d4bb210465f7aad
parenta201e5776350262f0af509ccb81fb974a6b038b5
Merge ... '9d487e0e820ff337d6de3af6ade625bea99a13f0'
     and 'f4f4fd93a0ba107d720385c50418ba1e95de7e91'