merge of '48173d5e9ba6b9c01006caf0faeedb090a20d0d1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Jul 2007 07:15:21 +0000 (07:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Jul 2007 07:15:21 +0000 (07:15 +0000)
commit3acbf74f8f8890f4af9d875d052e45036f546613
tree20ddfc4339475dc7a6e179b1cd2468e08dced4c5
parent0656303da8128a1ff55fe8e424d9b8592c92b5d5
parent696fbb01841746b81d3d58716e1cb41e1482edc5
Merge ... '48173d5e9ba6b9c01006caf0faeedb090a20d0d1'
     and 'f3281034536642327c1e507cb7559b3899f99d18'