merge of '8a506316a17c249d0b58a6a584e41a5f3920f173'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 14:19:22 +0000 (14:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 14:19:22 +0000 (14:19 +0000)
commit7df34642f9d073cf00bb743b50583cfe204232d0
treeb43d320aa75b175ac6ff1c86a17249eede4dd4cd
parent27c6c06e8536256c8d54e388da40c414bcd00586
parentc3bd2e3def07d4e6badd498b9b2e991dd8c3d39e
Merge ... '8a506316a17c249d0b58a6a584e41a5f3920f173'
     and 'c7e63745b6f6d280a7932ebadb8a295d11ec2998'