merge of 'cae3b4333167ab63d418dcd8fac25afe9618f558'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 2 Apr 2007 11:01:21 +0000 (11:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 2 Apr 2007 11:01:21 +0000 (11:01 +0000)
commite594922b212f927eb76ed624b90602ae5da0a9f4
tree167e461c812a5102c82a4d7c35ade24afd009412
parent335ea31f4d6d37a42e4fcca9011b24a80799bf13
parentba69d5da69dc8c808269c61e8ce254e60a49e823
Merge ... 'cae3b4333167ab63d418dcd8fac25afe9618f558'
     and 'ef4213537fde8f688658cbb0ae500c5e4fbfa8bf'