merge of '2754e872d313aa16f8b70a6b1475a5fe5cd1b5c0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 20 Oct 2006 06:57:59 +0000 (06:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 20 Oct 2006 06:57:59 +0000 (06:57 +0000)
commit272312d86a6d0d5e8045b66e9f381b1974a2ffca
tree621db03a4288ae84a28be7f39b66f29509e371e3
parentc6ea5e057c49dbf40b6e495ea1e29890cbeb2ae0
parente59264b9bfe147bf874cb884bc474882cc1e73d1
Merge ... '2754e872d313aa16f8b70a6b1475a5fe5cd1b5c0'
     and 'f8e3d83965086984baadee15f33b6b7a0bdfe743'