merge of '5f8e2fb083d5b8b890fa66425a21fcce539d65ef'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 2 Dec 2006 18:02:59 +0000 (18:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 2 Dec 2006 18:02:59 +0000 (18:02 +0000)
commit857a4b5ba548f5bb797d1dc2efb42fa38792109a
treed817d5bd2ebb336fbe2ad3ea08477aaa38738dcd
parentaecca3c7561b165697abf319fe5cee27ba83c3cc
parentc90f9cc676882d2aca9c805f0587041c982cd26c
Merge ... '5f8e2fb083d5b8b890fa66425a21fcce539d65ef'
     and '7aedd4ff460b16cce3273fd31ead110f66692fc8'