merge of '5b2b2941e7e4881e571d056410b3ef2263b250e5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 May 2007 09:05:50 +0000 (09:05 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 May 2007 09:05:50 +0000 (09:05 +0000)
commitd66bef61f2d883318067ab0f487c90173644ec32
tree8d13b2dd88a568eaf67b4e4bbe918cefc8d02f9d
parentd6fceff7728b7caecd6e2695f37e700769b1f01a
parent9840546cfd89f664d418a430ca7dcc57afd5d644
Merge ... '5b2b2941e7e4881e571d056410b3ef2263b250e5'
     and '901164f6a5d50bc1f20f96bb73165ccb97935f9c'