merge of 'b6708d0e783584df013d6e06de41bae699f0bd34'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 13:52:38 +0000 (13:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 13:52:38 +0000 (13:52 +0000)
commit9163028d4ddfc3a83d3ee62b7a411782fdad740c
tree7cf33804a98a3b7102cc3a10aa4c2f895e82f164
parent7171e115d170392689aeb662c5c4381b3275f69d
parentbe0f0ae61525a8d589231e2a800d917f78e48f4d
Merge ... 'b6708d0e783584df013d6e06de41bae699f0bd34'
     and 'eef154087bbe16b0d2143a5c529dab7e716705f8'