merge of '0a38e7566051393faa3d7b2924eecdf612c4c021'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 13 Jun 2007 08:06:29 +0000 (08:06 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 13 Jun 2007 08:06:29 +0000 (08:06 +0000)
commit7cfcf500327b4def8a4485bb53850961ec096202
tree28a09afdc43447b76215767450b7c32e91fb85a2
parent7fc972d40dc286150feebe1f101ccf3d842b4e32
parent1cddb9beecc177f61483cbd5e87cb5d56eae551d
Merge ... '0a38e7566051393faa3d7b2924eecdf612c4c021'
     and 'b1f3f390dc5b827a9150f1505d6710782551944d'