merge of '83560af206bd8bb934b62f0842171cd71f11387e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 16 Nov 2006 14:20:32 +0000 (14:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 16 Nov 2006 14:20:32 +0000 (14:20 +0000)
commitda08c67762e7925da7c19ee199be31370a562788
tree26a7043cb3f943aa84f7e5de6d37998bbc607d88
parentf04cd3dee1dc4da9585d5ec099186c78157ea4f8
parentff6659eeaa3d00b36e2181643b6ced59d606f4c4
Merge ... '83560af206bd8bb934b62f0842171cd71f11387e'
     and 'c4bb9c5cc658fec27d922fbfa89e108c32d4a842'